更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/RoleController.java

@@ -45,6 +45,15 @@ public class RoleController {
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "角色管理_角色列表_1_Menu")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "角色管理_角色列表_1_Menu")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "角色管理_角色列表_1_Menu")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "角色管理列表-分页查询", description = "角色管理列表-分页查询")
+    @RequestMapping(value = {"pageManager"}, method = {RequestMethod.POST})
+    public ResultContent<Page<RoleModel>> pageManager(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) RoleSearchParam param) {
+        return roleService.page(param, pageable);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "角色列表-分页查询", description = "角色列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleServiceImpl.java

@@ -368,6 +368,10 @@ public class RoleServiceImpl extends SuperService {
         } else {
             auth.removeAll(param.getAuths());
         }
+        // 管理员角色默认有 管理员的权限
+        if (role.getIsAdmin() != null && role.getIsAdmin()) {
+            auth.add(AuthConstant.Admin);
+        }
         roleModel.setAuth(auth);
         roleService.updateRole(roleModel);
         return ResultContent.buildSuccess(roleModel);