From a84e27d68778676d89c0a28a120e9e5d93b7a288 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 28 Nov 2023 16:33:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2excel=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/datasource/provider/ExcelUtils.java   | 2 +-
 .../java/io/dataease/datasource/server/DatasourceServer.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
index 9fa6b85ca0..74d045d614 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
@@ -351,7 +351,7 @@ public class ExcelUtils {
                 ReadCellData<?> cellData = headMap.get(key);
                 String value = cellData.getStringValue();
                 if (StringUtils.isEmpty(value)) {
-                    DEException.throwException(context.readSheetHolder().getSheetName() + ", 首行行中不允许有空单元格！");
+                    continue;
                 }
                 headerKey.add(key);
                 header.add(value);
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 d6550acdba..3e07e263b4 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
@@ -755,7 +755,7 @@ public class DatasourceServer implements DatasourceApi {
                         }
                     }
                 }
-                if (CollectionUtils.isEmpty(excelSheetDataList)) {
+                if (CollectionUtils.isEmpty(excelSheetDataList) || excelSheetDataList.size() != datasetTableDTOS.size()) {
                     DEException.throwException("上传文件与源文件不一致，请检查文件!");
                 }
                 excelFileData.setSheets(excelSheetDataList);