|
@@ -305,17 +305,22 @@ public class RolePrivilegeController extends ControllerSupport {
|
|
|
|
|
|
List<Long> roleIdList = getAccessUserRoleIdList();
|
|
|
|
|
|
- List<PrivilegeEntity> PrivilegeEntityList = privilegeRepo
|
|
|
+ List<PrivilegeEntity> privilegeEntityList = privilegeRepo
|
|
|
.findAllByCodeIn(privilegeCodeList);
|
|
|
|
|
|
Map<String, Boolean> ret = Maps.newHashMap();
|
|
|
|
|
|
- for (PrivilegeEntity cur : PrivilegeEntityList) {
|
|
|
- List<RolePrivilegeRelationEntity> relationEntityList = rolePrivilegeRelationRepo
|
|
|
- .findAllByRoleIdInAndRootOrgIdAndPrivilegeId(roleIdList,
|
|
|
- accessUser.getRootOrgId(), cur.getId());
|
|
|
+ boolean isSuperAdmin = isSuperAdmin();
|
|
|
|
|
|
- ret.put(cur.getCode(), CollectionUtils.isNotEmpty(relationEntityList));
|
|
|
+ for (PrivilegeEntity cur : privilegeEntityList) {
|
|
|
+ if (isSuperAdmin) {
|
|
|
+ ret.put(cur.getCode(), true);
|
|
|
+ } else {
|
|
|
+ List<RolePrivilegeRelationEntity> relationEntityList = rolePrivilegeRelationRepo
|
|
|
+ .findAllByRoleIdInAndRootOrgIdAndPrivilegeId(roleIdList,
|
|
|
+ accessUser.getRootOrgId(), cur.getId());
|
|
|
+ ret.put(cur.getCode(), CollectionUtils.isNotEmpty(relationEntityList));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return ret;
|