提交 183090ce authored 作者: taojinlong's avatar taojinlong

fix: excel 数据集新增字段后,追加失败

上级 a87737ab
...@@ -853,7 +853,7 @@ public class DataSetTableService { ...@@ -853,7 +853,7 @@ public class DataSetTableService {
public Map<String, Object> getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception { public Map<String, Object> getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
if(ds == null){ if (ds == null) {
throw new Exception(Translator.get("i18n_invalid_ds")); throw new Exception(Translator.get("i18n_invalid_ds"));
} }
DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
...@@ -1845,9 +1845,8 @@ public class DataSetTableService { ...@@ -1845,9 +1845,8 @@ public class DataSetTableService {
List<ExcelSheetData> retrunSheetDataList = new ArrayList<>(); List<ExcelSheetData> retrunSheetDataList = new ArrayList<>();
if (StringUtils.isNotEmpty(tableId) && editType == 1) { if (StringUtils.isNotEmpty(tableId) && editType == 1) {
List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId); List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId)
datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0) .stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
.collect(Collectors.toList());
datasetTableFields.sort((o1, o2) -> { datasetTableFields.sort((o1, o2) -> {
if (o1.getColumnIndex() == null) { if (o1.getColumnIndex() == null) {
return -1; return -1;
...@@ -1857,8 +1856,8 @@ public class DataSetTableService { ...@@ -1857,8 +1856,8 @@ public class DataSetTableService {
} }
return o1.getColumnIndex().compareTo(o2.getColumnIndex()); return o1.getColumnIndex().compareTo(o2.getColumnIndex());
}); });
List<String> oldFields = datasetTableFields.stream().map(DatasetTableField::getOriginName)
.collect(Collectors.toList()); List<String> oldFields = datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList());
for (ExcelSheetData excelSheetData : excelSheetDataList) { for (ExcelSheetData excelSheetData : excelSheetDataList) {
List<TableField> fields = excelSheetData.getFields(); List<TableField> fields = excelSheetData.getFields();
List<String> newFields = fields.stream().map(TableField::getRemarks).collect(Collectors.toList()); List<String> newFields = fields.stream().map(TableField::getRemarks).collect(Collectors.toList());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论