瀏覽代碼

更新!

TRX 1 年之前
父節點
當前提交
d21f8c6a81

+ 6 - 10
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DictInfoController.java

@@ -36,17 +36,16 @@ 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 = "areaManager", type = AuthType.Platform, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域管理_区域列表_160_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})
-    public ResultContent<Page<DictInfoParam>> areaPageManager(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+    public ResultContent<Page<DictInfoParam>> areaPageManager(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
             @Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.page(param, pageable);
@@ -55,9 +54,7 @@ public class DictInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "字典列表-分页查询", description = "字典列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DictInfoParam>> page(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<Page<DictInfoParam>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DictInfoSearch param) {
         return dictInfoService.page(param, pageable);
     }
 
@@ -85,8 +82,7 @@ public class DictInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询字典所有的数据", description = "查询字典所有的数据")
     @RequestMapping(value = {"findDictInfosByOid"}, method = {RequestMethod.POST})
-    public ResultContent<List<DictInfoParam>> findDictInfosByOid(
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<List<DictInfoParam>> findDictInfosByOid(@Parameter(required = false) DictInfoSearch param) {
         return dictInfoService.findDictInfosByOid(param);
     }
 

+ 16 - 14
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -215,20 +215,22 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_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 = "projectAreaManager", method = {RequestMethod.GET})
-    public ResultContent projectAreaManager() {
-        return ResultContent.buildSuccess();
-    }
+    // 使用
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_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 = "projectAreaManager", method = {RequestMethod.GET})
+//    public ResultContent projectAreaManager() {
+//        return ResultContent.buildSuccess();
+//    }
+
 
     @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
     @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")