From 183090cee60f573c68ac58a5caf314804b6d3344 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Mar 2022 22:01:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20excel=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=90=8E=EF=BC=8C=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/DataSetTableService.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 fb6fc9a9b8..48cf75ce9d 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -853,7 +853,7 @@ public class DataSetTableService { public Map getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception { Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); - if(ds == null){ + if (ds == null) { throw new Exception(Translator.get("i18n_invalid_ds")); } DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); @@ -1845,9 +1845,8 @@ public class DataSetTableService { List retrunSheetDataList = new ArrayList<>(); if (StringUtils.isNotEmpty(tableId) && editType == 1) { - List datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId); - datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0) - .collect(Collectors.toList()); + List datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId) + .stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList()); datasetTableFields.sort((o1, o2) -> { if (o1.getColumnIndex() == null) { return -1; @@ -1857,8 +1856,8 @@ public class DataSetTableService { } return o1.getColumnIndex().compareTo(o2.getColumnIndex()); }); - List oldFields = datasetTableFields.stream().map(DatasetTableField::getOriginName) - .collect(Collectors.toList()); + + List oldFields = datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()); for (ExcelSheetData excelSheetData : excelSheetDataList) { List fields = excelSheetData.getFields(); List newFields = fields.stream().map(TableField::getRemarks).collect(Collectors.toList());