public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 21:12:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13943 from dataease/pr@dev-v2@fixds

Browse Source 
Pr@dev v2@fixds
This commit is contained in:
taojinlong
2024-12-10 15:48:52 +08:00
committed by GitHub
parent de7f98a48b 11f628bb75
commit 24f91289a1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@@ -433,6 +433,7 @@ public class DatasourceServer implements DatasourceApi {
commonThreadPool.addTask(() -> {
datasourceSyncManage.extractExcelData(requestDatasource, "add_scope");
});
ExcelUtils.mergeSheets(requestDatasource, sourceData);
dataSourceManage.checkName(dataSourceDTO);
dataSourceManage.innerEdit(requestDatasource);
}
@@ -796,9 +797,6 @@ public class DatasourceServer implements DatasourceApi {
}
}
}
if (CollectionUtils.isEmpty(excelSheetDataList) || excelSheetDataList.size() != datasetTableDTOS.size()) {
DEException.throwException("上传文件与源文件不一致，请检查文件!");
}
excelFileData.setSheets(excelSheetDataList);
}
} else {

2
sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java
View File

@@ -26,7 +26,7 @@ public class GlobalExceptionHandler {
@ExceptionHandler(DEException.class)
public ResultMessage deExceptionHandler(DEException e) {
LogUtil.error(e.getMessage());
LogUtil.error(e.getMessage(), e);
return new ResultMessage(e.getCode(),e.getMessage());
}