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 1ac38447b7..ddc40c7ead 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1183,7 +1183,7 @@ public class DataSetTableService { if (StringUtils.isNotEmpty(tableId) && editType == 1 ) { List datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId); - datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); + datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList()); datasetTableFields.sort((o1, o2) -> { if (o1.getColumnIndex() == null) { return -1; diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index cf4912bad5..e3113c3001 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -164,7 +164,7 @@ public class ExtractDataService { if(datasetTableFields == null){ datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build()); } - datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); + datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList()); datasetTableFields.sort((o1, o2) -> { if (o1.getColumnIndex() == null) { return -1; @@ -274,7 +274,7 @@ public class ExtractDataService { datasource.setType(datasetTable.getType()); } List datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build()); - datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); + datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList()); datasetTableFields.sort((o1, o2) -> { if (o1.getColumnIndex() == null) { return -1;