From 1a9d71c8d4dc81fbe2190130d058eb1e81b026e3 Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 8 Aug 2022 18:14:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=A0=E7=BB=84=E7=BB=87=E6=97=A0=E6=B3=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F=E8=A1=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/PermissionsTreeService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java index eefb995999..583d2eee68 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java @@ -86,11 +86,9 @@ public class PermissionsTreeService { datasetRowPermissions.addAll(rowPermissionTreeService.list(dataSetRowPermissionsDTO)); } - if (ObjectUtils.isNotEmpty(deptId)) { - dataSetRowPermissionsDTO.setAuthTargetIds(null); - dataSetRowPermissionsDTO.setAuthTargetType("sysParams"); - datasetRowPermissions.addAll(rowPermissionTreeService.list(dataSetRowPermissionsDTO)); - } + dataSetRowPermissionsDTO.setAuthTargetIds(null); + dataSetRowPermissionsDTO.setAuthTargetType("sysParams"); + datasetRowPermissions.addAll(rowPermissionTreeService.list(dataSetRowPermissionsDTO)); // 若当前用户是白名单中的，则忽略permission tree // 若当前规则是系统变量，则替换变量