diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java index 4520b840ab..fa047fd529 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java @@ -113,7 +113,7 @@ public class DatasetSQLBotManage { DataSetColumnPermissionsDTO dataSetColumnPermissionsDTO = new DataSetColumnPermissionsDTO(); dataSetColumnPermissionsDTO.setAuthTargetId(uid); dataSetColumnPermissionsDTO.setAuthTargetType("user"); - dataSetColumnPermissionsDTO.setEnable(true); + // dataSetColumnPermissionsDTO.setEnable(true); List dataSetColumnPermissionsDTOS = columnPermissionsApi.list(dataSetColumnPermissionsDTO); if (CollectionUtils.isNotEmpty(roleIds)) { @@ -364,6 +364,11 @@ public class DatasetSQLBotManage { if (ObjectUtils.isEmpty(fields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } + if (sqlbotFields.size() > fields.size()) { + Set fieldIdSet = fields.stream().map(DatasetTableFieldDTO::getId).collect(Collectors.toSet()); + List filterSqlbotFields = sqlbotFields.stream().filter(item -> fieldIdSet.contains(item.getFieldId())).collect(Collectors.toList()); + table.setFields(filterSqlbotFields); + } } buildFieldName(sqlMap, originFields); Map dsMap = (Map) sqlMap.get("dsMap");