cs

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 = "")
-    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
-    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+//    @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/orgManager/AreaTypeManagerController.java

@@ -37,9 +37,9 @@ public class AreaTypeManagerController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域类型管理_类型列表_1_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域类型管理_类型列表_1_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域类型管理_类型列表_1_Menu")
+    @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 = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

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

@@ -37,9 +37,9 @@ public class PositionManagerController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "positionList", type = AuthType.Platform, remark = "职位管理_职位列表_1_Menu")
-    @ResourceAuth(value = "positionList", type = AuthType.Project, remark = "职位管理_职位列表_1_Menu")
-    @ResourceAuth(value = "positionList", type = AuthType.School, remark = "职位管理_职位列表_1_Menu")
+//    @ResourceAuth(value = "positionList", type = AuthType.Platform, remark = "职位管理_职位列表_1_Menu")
+//    @ResourceAuth(value = "positionList", type = AuthType.Project, remark = "职位管理_职位列表_1_Menu")
+//    @ResourceAuth(value = "positionList", 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 = "")

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

@@ -36,8 +36,8 @@ public class ProjectBindOrgController {
     private ProjectBindOrgServiceImpl projectBindOrgService;
 
     //------------------------------机构管理 start----------------------
-    @ResourceAuth(value = "projectBindOrg", type = AuthType.Platform, remark = "项目机构管理_绑定项目_2_Button")
-    @ResourceAuth(value = "projectBindOrg", type = AuthType.Project, remark = "项目机构管理_绑定项目_2_Button")
+//    @ResourceAuth(value = "projectBindOrg", type = AuthType.Platform, remark = "项目机构管理_绑定项目_2_Button")
+//    @ResourceAuth(value = "projectBindOrg", type = AuthType.Project, remark = "项目机构管理_绑定项目_2_Button")
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "项目绑定机构-保存", description = "项目绑定机构-保存")
@@ -46,8 +46,8 @@ public class ProjectBindOrgController {
         return this.projectBindOrgService.projectBindOrg(param);
     }
 
-    @ResourceAuth(value = "projectOrgPage", type = AuthType.Platform, remark = "项目机构管理_机构列表_1_Menu")
-    @ResourceAuth(value = "projectOrgPage", type = AuthType.Project, remark = "项目机构管理_机构列表_1_Menu")
+//    @ResourceAuth(value = "projectOrgPage", type = AuthType.Platform, remark = "项目机构管理_机构列表_1_Menu")
+//    @ResourceAuth(value = "projectOrgPage", type = AuthType.Project, remark = "项目机构管理_机构列表_1_Menu")
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "项目机构列表-分页查询", description = "项目机构列表-分页查询")

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

@@ -50,9 +50,9 @@ public class SchoolUserController {
     @Autowired
     OrganizationUserServiceImpl organizationUserService;
 
-    @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 = "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 = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

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

@@ -303,7 +303,13 @@ public class RoleServiceImpl extends SuperService {
         List<AuthModel> authModels = new ArrayList<>();
 
         if (organizationType != null) {
-            authResourcesNameModels = authResourcesNameService.list(organizationType, PageRequest.of(0, 9999, Sort.by(Sort.Order.desc("createTime")))).getContent().getContent();
+//            com.github.microservice.auth.client.content.ResultContent<Page<AuthResourcesNameModel>> content =  authResourcesNameService.list(organizationType, PageRequest.of(0, 200, Sort.by(Sort.Order.desc(
+//                    "createTime"))));
+//            authResourcesNameModels = content.getContent().getContent();
+
+            com.github.microservice.auth.client.content.ResultContent<List<AuthResourcesNameModel>> content =  authResourcesNameService.getAll(organizationType);
+            authResourcesNameModels = content.getContent();
+
             authResourcesNameModels.forEach(it -> {
                 String remark = it.getRemark();
                 if (StringUtils.isNotEmpty(remark)) {