From 14194fe6a4fe07382e8b1ad624dd266f736bcb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=BB=B4=E4=BC=9F?= Date: Mon, 18 Dec 2023 18:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=80=BB=E8=BE=91:=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E5=8C=85=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E7=AD=89=E7=89=B9=E6=AE=8A=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java | 7 +++++++ .../server/controller/roleuser/RoleUserController.java | 9 +++++++++ .../cn/axzo/tyr/server/service/SaasRoleUserService.java | 4 +++- .../cn/axzo/tyr/server/service/impl/RoleUserService.java | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) 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());