|
@@ -219,13 +219,23 @@ public class RolePrivilegeController extends ControllerSupport {
|
|
|
|
|
|
@ApiOperation(value = "查询权限树")
|
|
@ApiOperation(value = "查询权限树")
|
|
@GetMapping("getPrivilegeTree/{groupId}")
|
|
@GetMapping("getPrivilegeTree/{groupId}")
|
|
- public EleTreeNode getPrivilegeTree(@PathVariable Long groupId) {
|
|
|
|
|
|
+ public EleTreeNode getPrivilegeTree(@PathVariable Long groupId,
|
|
|
|
+ @RequestParam(required = false) Boolean all) {
|
|
PrivilegeGroupEntity group = GlobalHelper.getEntity(privilegeGroupRepo, groupId,
|
|
PrivilegeGroupEntity group = GlobalHelper.getEntity(privilegeGroupRepo, groupId,
|
|
PrivilegeGroupEntity.class);
|
|
PrivilegeGroupEntity.class);
|
|
List<PrivilegeEntity> privilegeList = privilegeRepo
|
|
List<PrivilegeEntity> privilegeList = privilegeRepo
|
|
.findAllByGroupIdOrderByWeightDesc(groupId);
|
|
.findAllByGroupIdOrderByWeightDesc(groupId);
|
|
EleTreeNode rootNode = new EleTreeNode(BasicConsts.ROOT_PRIVILEGE_ID, group.getName());
|
|
EleTreeNode rootNode = new EleTreeNode(BasicConsts.ROOT_PRIVILEGE_ID, group.getName());
|
|
- TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList, disabledPrivilegeCodeList, false);
|
|
|
|
|
|
+
|
|
|
|
+ if (null != all && all) {
|
|
|
|
+ if (!isSuperAdmin()) {
|
|
|
|
+ throw new StatusException("012001", "非法请求");
|
|
|
|
+ }
|
|
|
|
+ TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList, Lists.newArrayList(), false);
|
|
|
|
+ } else {
|
|
|
|
+ TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList, disabledPrivilegeCodeList,
|
|
|
|
+ false);
|
|
|
|
+ }
|
|
|
|
|
|
return rootNode;
|
|
return rootNode;
|
|
}
|
|
}
|