diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 6d46d0b169..8539ce7738 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1659,9 +1659,18 @@ public class DataSetTableService { } List fields = dataSetTableFieldsService.getListByIdsEach(unionDTO.getCurrentDsField()); - String[] array = fields.stream().filter(Objects::nonNull) - .map(f -> table + "." + f.getDataeaseName() + " AS " - + TableUtils.fieldName(tableId + "_" + f.getDataeaseName())) + String[] array = fields.stream() + .map(f -> { + String s = ""; + if (f == null) { + DEException.throwException( + Translator.get("i18n_ds_error")); + } else { + s = table + "." + f.getDataeaseName() + " AS " + + TableUtils.fieldName(tableId + "_" + f.getDataeaseName()); + } + return s; + }) .toArray(String[]::new); checkedInfo.put(table, array); checkedFields.addAll(fields);