更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/ModularModel.java

@@ -12,6 +12,12 @@ public class ModularModel implements Serializable {
     @Schema(description = "分组名称,如：角色管理")
     private String name;
 
+    private String value;
+
+    public String getValue() {
+        return name;
+    }
+
     @Schema(description = "权限列表")
     private List<AuthModel> authModels;
 }

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

@@ -25,12 +25,12 @@ public class RegionController {
     @Autowired
     RegionService regionService;
 
-    @ResourceAuth(value = "regionManager", type = AuthType.Platform, remark = "区域管理_区域管理_1_Menu")
-    @ResourceAuth(value = "regionManager", type = AuthType.Project, remark = "区域管理_区域管理_1_Menu")
-    @ResourceAuth(value = "regionManager", type = AuthType.School, remark = "区域管理_区域管理_1_Menu")
-    @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 = "regionManager", type = AuthType.Platform, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "regionManager", type = AuthType.Project, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "regionManager", type = AuthType.School, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @Operation(summary = "获取地区数据")
     @RequestMapping(value = "getRegionManager", method = RequestMethod.POST)
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)

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

@@ -42,9 +42,9 @@ public class RoleController {
     @ResourceAuth(value = "roleList", type = AuthType.Platform, remark = "角色管理_角色列表_1_Menu")
     @ResourceAuth(value = "roleList", type = AuthType.Project, remark = "角色管理_角色列表_1_Menu")
     @ResourceAuth(value = "roleList", type = AuthType.School, remark = "角色管理_角色列表_1_Menu")
-    @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 = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "角色管理列表-分页查询", description = "角色管理列表-分页查询")
     @RequestMapping(value = {"pageManager"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/AreaController.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.controller.school;
 
+import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
@@ -24,6 +25,20 @@ public class AreaController {
     @Autowired
     AreaService areaService;
 
+    @ResourceAuth(value = "areaManager", type = AuthType.Platform, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到机构区域树-通用", description = "得到机构区域树")
+    @RequestMapping(value = "getManagerAreaTree", method = {RequestMethod.POST})
+    public ResultContent getManagerAreaTree(@RequestBody OidModel param) {
+        return this.areaService.getAreaTree(param.getOid());
+    }
+
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "添加-编辑区域-通用", description = "添加-编辑区域")
     @RequestMapping(value = "addArea", method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DeviceBindController.java

@@ -35,9 +35,9 @@ public class DeviceBindController {
     @ResourceAuth(value = "deviceManager", type = AuthType.Platform, remark = "设备管理_设备列表_1_Menu")
     @ResourceAuth(value = "deviceManager", type = AuthType.Project, remark = "设备管理_设备列表_1_Menu")
     @ResourceAuth(value = "deviceManager", type = AuthType.School, remark = "设备管理_设备列表_1_Menu")
-    @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 = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设备列表-分页查询", description = "设备列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DictInfoController.java

@@ -39,12 +39,12 @@ public class DictInfoController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "areaManager", type = AuthType.Platform, remark = "区域类型_区域类型_1_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域类型_区域类型_1_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域类型_区域类型_1_Menu")
-    @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 = "areaManager", type = AuthType.Platform, remark = "区域类型_区域类型列表_1_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域类型_区域类型列表_1_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域类型_区域类型列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "区域列表-分页查询", description = "区域列表-分页查询")
     @RequestMapping(value = {"areaPageManager"}, method = {RequestMethod.POST})
@@ -55,12 +55,12 @@ public class DictInfoController {
         return dictInfoService.page(param, pageable);
     }
 
-    @ResourceAuth(value = "positionManager", type = AuthType.Platform, remark = "人员职位_人员职位_1_Menu")
-    @ResourceAuth(value = "positionManager", type = AuthType.Project, remark = "人员职位_人员职位_1_Menu")
-    @ResourceAuth(value = "positionManager", type = AuthType.School, remark = "人员职位_人员职位_1_Menu")
-    @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 = "positionManager", type = AuthType.Platform, remark = "人员职位_职位列表_1_Menu")
+    @ResourceAuth(value = "positionManager", type = AuthType.Project, remark = "人员职位_职位列表_1_Menu")
+    @ResourceAuth(value = "positionManager", type = AuthType.School, remark = "人员职位_职位列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "人员职位列表-分页查询", description = "人员职位列表-分页查询")
     @RequestMapping(value = {"positionPageManager"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/SchoolUserController.java

@@ -47,9 +47,9 @@ public class SchoolUserController {
     @ResourceAuth(value = "schoolUserManager", type = AuthType.Platform, remark = "人员管理_人员列表_1_Menu")
     @ResourceAuth(value = "schoolUserManager", type = AuthType.Project, remark = "人员管理_人员列表_1_Menu")
     @ResourceAuth(value = "schoolUserManager", type = AuthType.School, remark = "人员管理_人员列表_1_Menu")
-    @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 = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "人员列表-分页查询", description = "人员列表-分页查询")
     @RequestMapping(value = {"pageOrgUserManager"}, method = {RequestMethod.POST})