diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 6fe37d53a9..ffbaf24241 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -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 { diff --git a/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java b/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java index fb8bb12604..267135617c 100644 --- a/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java +++ b/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java @@ -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()); }