diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java index cb09bcb6..bd3691e6 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java @@ -75,4 +75,11 @@ public interface TyrSaasRoleUserApi { @PostMapping("/api/saas-role-user/remove-role-user-relation") ApiResult removeRoleUserRelation(@RequestBody @Valid List ids); + /** + * 获取分包负责人等特殊角色 + * @return + */ + @PostMapping("/api/saas-role-user/get-special-role") + ApiResult> getSpecialRole(); + } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java index ab8f6a21..49571124 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java @@ -32,6 +32,7 @@ public class RoleUserController implements TyrSaasRoleUserApi { private final SaasRoleUserService saasRoleUserService; private final SaasRoleUserRelationService saasRoleUserRelationService; private final SaasRoleUserRelationDao saasRoleUserRelationDao; + @Override public ApiResult saveOrUpdate(@Valid RoleUserReq req) { saasRoleUserService.saveOrUpdate(req); @@ -93,4 +94,12 @@ public class RoleUserController implements TyrSaasRoleUserApi { .update(); return ApiResult.ok(); } + + /** + * 获取分包负责人等特殊角色 + * @return + */ + public ApiResult> getSpecialRole() { + return ApiResult.ok(saasRoleUserService.getSpecialRole()); + } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java index 2a0335bf..9a3f2b5d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java @@ -14,7 +14,9 @@ import java.util.Set; */ public interface SaasRoleUserService { - void saveOrUpdate( RoleUserReq req); + List getSpecialRole(); + + void saveOrUpdate(RoleUserReq req); /** * 是超管 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index 6d6541ce..d5be56f1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -54,6 +54,7 @@ public class RoleUserService implements SaasRoleUserService { * 获取分包负责人等特殊角色 * @return */ + @Override public List getSpecialRole() { if (participateUnitDefaultRoleId != null && participateUnitDefaultRoleId.size() > 0) { return participateUnitDefaultRoleId.values().stream().collect(Collectors.toList());