|
|
@@ -70,7 +70,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
@RequestMapping("${$rmp.ctr.basic}/rolePrivilege")
|
|
|
public class RolePrivilegeController extends ControllerSupport {
|
|
|
|
|
|
- private static List<String> disabledCodeList = Arrays
|
|
|
+ private static List<String> disabledPrivilegeCodeList = Arrays
|
|
|
.asList(new String[]{"index_privilege_group_list", "index_app_list", "index_school",
|
|
|
"school_config", "index_resource_list", "index_role_privilege_settings",
|
|
|
"index_school_privilege_settings"});
|
|
|
@@ -166,6 +166,8 @@ public class RolePrivilegeController extends ControllerSupport {
|
|
|
// 超级管理员拥有所有权限
|
|
|
if (isSuperAdmin()) {
|
|
|
hasPrivilege = true;
|
|
|
+ } else if (disabledPrivilegeCodeList.contains(cur.getCode())) {
|
|
|
+ hasPrivilege = false;
|
|
|
}
|
|
|
if ((!full) && (!hasPrivilege)) {
|
|
|
continue;
|
|
|
@@ -229,7 +231,7 @@ public class RolePrivilegeController extends ControllerSupport {
|
|
|
List<PrivilegeEntity> privilegeList = privilegeRepo
|
|
|
.findAllByGroupIdOrderByWeightDesc(groupId);
|
|
|
EleTreeNode rootNode = new EleTreeNode(BasicConsts.ROOT_PRIVILEGE_ID, group.getName());
|
|
|
- TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList, disabledCodeList, false);
|
|
|
+ TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList, disabledPrivilegeCodeList, false);
|
|
|
|
|
|
return rootNode;
|
|
|
}
|
WANG