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 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> 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> jsonArray = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data)) { jsonArray = data.stream().map(ele -> {