center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 精简模式Excel数据集在单元格中包含特殊符号或空值时会报错

Browse Source
This commit is contained in:
taojinlong 2022-04-27 11:26:15 +08:00
parent a3ff9c9459
commit ab5b1be514
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

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

6
backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
View File

@ -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);

3
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -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 -> {