From 830a5b146495ea7970dc4ceb4793c919320c95fa Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 8 Jul 2024 15:27:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dataset/manage/PermissionManage.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java index 0477ea743e..78a7019ece 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java @@ -195,15 +195,22 @@ public class PermissionManage { DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(record.getExpressionTree(), DatasetRowPermissionsTreeObj.class); List items = new ArrayList<>(); for (DatasetRowPermissionsTreeItem datasetRowPermissionsTreeItem : tree.getItems()) { - if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userId}")) { + if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userId}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getAccount()); + items.add(datasetRowPermissionsTreeItem); + continue; } - if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userEmail}")) { + if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userEmail}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getEmail()); + items.add(datasetRowPermissionsTreeItem); + continue; } - if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userName}")) { + if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userName}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getName()); + items.add(datasetRowPermissionsTreeItem); + continue; } + String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem.getValue()); if (value == null) { continue;