From ab5b1be514441f50779448d0b7b96fd21139f9a9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 27 Apr 2022 11:26:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B2=BE=E7=AE=80=E6=A8=A1=E5=BC=8FExce?=
 =?UTF-8?q?l=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9C=A8=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=AD=E5=8C=85=E5=90=AB=E7=89=B9=E6=AE=8A=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=88=96=E7=A9=BA=E5=80=BC=E6=97=B6=E4=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/commons/utils/ExcelXlsxReader.java     | 3 +++
 .../src/main/java/io/dataease/provider/DDLProviderImpl.java | 6 +++++-
 .../io/dataease/service/dataset/DataSetTableService.java    | 3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index 2dd264335c..bd30fffb49 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -310,6 +310,9 @@ public class ExcelXlsxReader extends DefaultHandler {
                     maxRef = ref;
                 }
                 if(curRow>1){
+                    for (int i=cellList.size();i<this.fields.size();i++){
+                        cellList.add("");
+                    }
                     List<String> tmp = new ArrayList<>(cellList);
                     this.getData().add(tmp);
                 }
diff --git a/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java b/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
index 014749a409..806fc846a9 100644
--- a/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
+++ b/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
@@ -40,8 +40,12 @@ public class DDLProviderImpl extends DDLProvider {
 
         Integer realSize = page * pageNumber < dataList.size() ? page * pageNumber : dataList.size();
         for (String[] strings : dataList.subList((page - 1) * pageNumber, realSize)) {
+            String[] strings1 = new String[strings.length];
+            for(int i=0; i< strings.length;i++){
+                strings1[i] = strings[i].replace("'","\\'");
+            }
             values.append("('").append(UUID.randomUUID())
-                    .append("','" ).append(String.join("','", Arrays.asList(strings)))
+                    .append("','" ).append(String.join("','", Arrays.asList(strings1)))
                     .append("'),");
         }
         return insertSql + values.substring(0, values.length() - 1);
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 d819248b01..83b7ce7303 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1930,8 +1930,7 @@ public class DataSetTableService {
         inputStream.close();
         excelSheetDataList.forEach(excelSheetData -> {
             List<List<String>> data = excelSheetData.getData();
-            String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getFieldName)
-                    .toArray(String[]::new);
+            String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getFieldName).toArray(String[]::new);
             List<Map<String, Object>> jsonArray = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(data)) {
                 jsonArray = data.stream().map(ele -> {