From 188665722fc4e9ab6f3752f017ed535d19af2cbf Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 12 Sep 2025 11:59:25 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AF=B9=E6=8E=A5=20SQLBot=20=E5=88=97?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=99=BD=E5=90=8D=E5=8D=95=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dataset/manage/DatasetSQLBotManage.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 fa047fd529..fc9713d8c0 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 @@ -105,7 +105,8 @@ public class DatasetSQLBotManage { } return AesUtils.aesEncrypt(text, aesKey, iv); } - + TypeReference> listTypeReference = new TypeReference>() { + }; private Map> getColPermission(Long uid, List roleIds) { ColumnPermissionsApi columnPermissionsApi = CommonBeanFactory.getBean(ColumnPermissionsApi.class); Objects.requireNonNull(columnPermissionsApi); @@ -122,7 +123,14 @@ public class DatasetSQLBotManage { dataSetColumnPermissionsDTO.setAuthTargetType("role"); List roleDataSetColumnPermissionsDTOS = columnPermissionsApi.list(dataSetColumnPermissionsDTO); if (CollectionUtils.isNotEmpty(roleDataSetColumnPermissionsDTOS)) { - dataSetColumnPermissionsDTOS.addAll(roleDataSetColumnPermissionsDTOS); + for (DataSetColumnPermissionsDTO dto :roleDataSetColumnPermissionsDTOS) { + List userIdList = JsonUtil.parseList(dto.getWhiteListUser(), listTypeReference); + if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(uid)) { + // roleColumnPermissionsDTOS.add(columnPermissionsDTO); + dataSetColumnPermissionsDTOS.add(dto); + } + } + // dataSetColumnPermissionsDTOS.addAll(roleDataSetColumnPermissionsDTOS); } } if (CollectionUtils.isEmpty(dataSetColumnPermissionsDTOS)) {