center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 行权限系统变量不生效

Browse Source
This commit is contained in:
taojinlong 2024-07-08 15:27:02 +08:00
parent 2483fb5162
commit 830a5b1464
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
View File

@ -195,15 +195,22 @@ public class PermissionManage {
DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(record.getExpressionTree(), DatasetRowPermissionsTreeObj.class); DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(record.getExpressionTree(), DatasetRowPermissionsTreeObj.class);
List<DatasetRowPermissionsTreeItem> items = new ArrayList<>(); List<DatasetRowPermissionsTreeItem> items = new ArrayList<>();
for (DatasetRowPermissionsTreeItem datasetRowPermissionsTreeItem : tree.getItems()) { 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()); 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()); 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()); datasetRowPermissionsTreeItem.setValue(userEntity.getName());
items.add(datasetRowPermissionsTreeItem);
continue;
} }
String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem.getValue()); String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem.getValue());
if (value == null) { if (value == null) {
continue; continue;