From 155fa98f46a27c13214e13e4b315e2dfb880f046 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 9 Dec 2024 16:14:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=90=E7=B3=BB=E7=BB=9F=E3=80=91?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E9=94=99=E8=AF=AF=E5=A0=86=E6=A0=88=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BE=93=E5=87=BA=E5=88=B0=20error.log=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/exception/GlobalExceptionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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());
     }
 

From 11f628bb7537cc81912fbbcb61fd57ad0ed93268 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 9 Dec 2024 16:26:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E3=80=91excel=20=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8Cexcel=20=E5=A4=9A=E4=B8=AA=20sheet=20=E9=83=BD?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/datasource/server/DatasourceServer.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 {