dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4214 from dataease/pr@dev@fixds

Browse Source 
fix: 解析csv文件异常
This commit is contained in:
xuwei-fit2cloud 2022-12-28 11:26:19 +08:00 committed by GitHub
commit db5fb923a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1116,7 +1116,7 @@ public class DataSetTableService {
if (dsType.equals(DatasourceTypes.oracle.getType())) { if (dsType.equals(DatasourceTypes.oracle.getType())) {
subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false)); subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false));
} else { } else {
if(fromItem.getAlias() == null){ if (fromItem.getAlias() == null) {
throw new Exception("Failed to parse sql, Every derived table must have its own alias！"); throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
} }
subSelect.setAlias(new Alias(fromItem.getAlias().toString())); subSelect.setAlias(new Alias(fromItem.getAlias().toString()));
@ -2426,7 +2426,7 @@ public class DataSetTableService {
jsonArray = data.stream().map(ele -> { jsonArray = data.stream().map(ele -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (int i = 0; i < fieldArray.length; i++) { for (int i = 0; i < fieldArray.length; i++) {
map.put(fieldArray[i], ele.get(i)); map.put(fieldArray[i], i < ele.size() ? ele.get(i) : "");
} }
return map; return map;
}).collect(Collectors.toList()); }).collect(Collectors.toList());