diff --git a/src/main/java/com/zhangmeng/online/exam/ui/controller/PermissionChooseController.java b/src/main/java/com/zhangmeng/online/exam/ui/controller/PermissionChooseController.java index 3a17a53..a4ca11c 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/controller/PermissionChooseController.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/controller/PermissionChooseController.java @@ -113,7 +113,13 @@ public class PermissionChooseController { private void setPermissionChecked(CheckBoxTreeItem item) { Permission permission = item.getValue().getPermission(); if (permission != null && role.hasPermission(permission.getId())) { - item.setSelected(true); + + if (permission.getParentId() == 0){ + item.setIndeterminate(true); + }else { + item.setSelected(true); + } + } item.getChildren().forEach(child -> diff --git a/src/main/java/com/zhangmeng/online/exam/ui/module/Role.java b/src/main/java/com/zhangmeng/online/exam/ui/module/Role.java index 3f43c81..5adf1ac 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/module/Role.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/module/Role.java @@ -79,7 +79,7 @@ public class Role { } public void setPermissions(List permissions) { - this.permissions = new ArrayList<>(permissions); + this.permissions = permissions; } public void addPermission(Permission permission) {