更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/AreaTypeManagerController.java

@@ -37,18 +37,20 @@ public class AreaTypeManagerController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域管理_类型列表_2_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域管理_类型列表_2_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域管理_类型列表_2_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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 = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "区域类型区域类型列表-分页查询", description = "人员区域类型列表-分页查询")
     @RequestMapping(value = {"areaTypePageManager"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DictInfoParam>> areaTypePageManager(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<Page<DictInfoParam>> areaTypePageManager(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.page(param, pageable);
     }
@@ -78,8 +80,7 @@ public class AreaTypeManagerController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询区域类型所有的数据", description = "查询区域类型所有的数据")
     @RequestMapping(value = {"findAreaTypeByOid"}, method = {RequestMethod.POST})
-    public ResultContent<List<DictInfoParam>> findAreaTypeByOid(
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<List<DictInfoParam>> findAreaTypeByOid(@Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.findDictInfosByOid(param);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -231,21 +231,21 @@ public class OrgMenuController {
 //        return ResultContent.buildSuccess();
 //    }
 
-
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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 = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
-    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "projectAreaTypeManager", method = {RequestMethod.GET})
-    public ResultContent projectAreaTypeManager() {
-        return ResultContent.buildSuccess();
-    }
+    // 使用
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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 = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+//    @ResourceAuth(value = "user", type = AuthType.User)
+//    @RequestMapping(value = "projectAreaTypeManager", method = {RequestMethod.GET})
+//    public ResultContent projectAreaTypeManager() {
+//        return ResultContent.buildSuccess();
+//    }
 
     @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_170_Menu")
     @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.School, remark = "OpenAPI_应用管理_170_Menu")