From e28a8fadd00c7eae1d84db99e497e6ea7f6849d6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 12 May 2021 12:15:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=20excel=20=E7=A9=BA?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableService.java  | 8 +++++---
 .../io/dataease/service/dataset/ExtractDataService.java   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index a1f69fe642..7ce260cf82 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -92,9 +92,11 @@ public class DataSetTableService {
             // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库
             if (insert == 1) {
                 saveTableField(datasetTable);
-                commonThreadPool.addTask(() -> {
-                    extractDataService.extractData(datasetTable.getId(), null, "all_scope");
-                });
+                if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
+                    commonThreadPool.addTask(() -> {
+                        extractDataService.extractData(datasetTable.getId(), null, "all_scope");
+                    });
+                }
             }
         } else {
             int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 52b9cf2a2f..894f118b40 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -494,6 +494,7 @@ public class ExtractDataService {
         excelInputMeta.setPassword("Encrypted");
         excelInputMeta.setFileName(new String[]{filePath});
         excelInputMeta.setStartsWithHeader(true);
+        excelInputMeta.setIgnoreEmptyRows(true);
         ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
         for (int i=0; i<datasetTableFields.size();i++) {
             ExcelInputField field = new ExcelInputField();