From aef8a7778e03700fb6b6b333409b636b68ee77a5 Mon Sep 17 00:00:00 2001 From: TanJ Date: Sat, 13 Jan 2024 17:41:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(2046)=20=E4=BF=AE=E6=94=B9=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java | 4 ++-- .../tyr/server/controller/role/SaasRoleGroupController.java | 2 +- .../cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java | 6 +++--- .../cn/axzo/tyr/server/service/SaasRoleGroupService.java | 2 +- .../cn/axzo/tyr/server/service/impl/RoleUserService.java | 5 ++--- .../tyr/server/service/impl/SaasRoleGroupServiceImpl.java | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java index 23e2db8e..c261b38e 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java @@ -54,12 +54,12 @@ public interface SaasRoleGroupApi { /** * * 通过categoryCode查询分组 - * @param categoryCode #{@link cn.axzo.tyr.client.common.enums.SaasPositionEnum} + * @param categoryCodes #{@link cn.axzo.tyr.client.common.enums.SaasPositionEnum} * * @return */ @GetMapping("/api/saasRoleGroup/listByCategoryCode") - ApiResult> listByCategoryCode(@RequestParam("categoryCode") String categoryCode); + ApiResult> listByCategoryCode(@RequestParam("categoryCode") List categoryCodes); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java index 2ae46e91..994e8e52 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java @@ -52,7 +52,7 @@ public class SaasRoleGroupController implements SaasRoleGroupApi { } @Override - public ApiResult> listByCategoryCode(String categoryCode) { + public ApiResult> listByCategoryCode(List categoryCode) { return ApiResult.ok(saasRoleGroupService.listByCategoryCode(categoryCode)); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java index 0fe928d9..2ba91076 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java @@ -51,9 +51,9 @@ public class SaasRoleGroupDao extends ServiceImpl listByCategoryCode(String categoryCode) { - return lambdaQuery().eq(BaseEntity::getIsDelete, 0L) - .eq(StrUtil.isNotBlank(categoryCode), SaasRoleGroup::getCategoryCode, categoryCode).list(); + public List listByCategoryCode(List categoryCode) { + return lambdaQuery().eq(BaseEntity::getIsDelete, 0L) + .in(SaasRoleGroup::getCategoryCode, categoryCode).list(); } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleGroupService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleGroupService.java index 966e0919..29936bef 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleGroupService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleGroupService.java @@ -31,5 +31,5 @@ public interface SaasRoleGroupService { * @param categoryCode * @return */ - List listByCategoryCode(String categoryCode); + List listByCategoryCode(List categoryCode); } 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 c2cdd7fb..a270a3f7 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 @@ -7,7 +7,6 @@ import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.pokonyan.util.KeysUtil; import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum; import cn.axzo.tyr.client.common.enums.RoleTypeEnum; -import cn.axzo.tyr.client.common.enums.SaasPositionEnum; import cn.axzo.tyr.client.model.BaseWorkspaceModel; import cn.axzo.tyr.client.model.enums.IdentityType; import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum; @@ -359,8 +358,8 @@ public class RoleUserService implements SaasRoleUserService { if (CollectionUtil.isEmpty(roleUserBaseInfo.getRoleUserResourceInfos())) { throw new ServiceException("grant team manager error, not found person info"); } - if (CollectionUtil.isEmpty(saasPgroupRoleRelations)) { + log.warn("warn: grant team manager permission error, not found permissions info"); // 未指定授权哪些角色 return; } @@ -414,7 +413,7 @@ public class RoleUserService implements SaasRoleUserService { if (StrUtil.isBlank(categoryCode)) { throw new ServiceException("不支持清除该人员所有角色，请指定分组"); } - List saasRoleGroupVO = saasRoleGroupService.listByCategoryCode(categoryCode); + List saasRoleGroupVO = saasRoleGroupService.listByCategoryCode(Lists.newArrayList(categoryCode)); List roleGroupRelations = saasRoleGroupRelationDao.findByGroupId(saasRoleGroupVO.stream().map(SaasRoleGroupVO::getId).collect(Collectors.toSet())); Set roleIds = roleGroupRelations.stream().map(SaasRoleGroupRelation::getRoleId).collect(Collectors.toSet()); if (CollectionUtil.isEmpty(roleIds)) { diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java index dbec9ca2..3dfaf22f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java @@ -160,7 +160,7 @@ public class SaasRoleGroupServiceImpl implements SaasRoleGroupService { } @Override - public List listByCategoryCode(String categoryCode) { + public List listByCategoryCode(List categoryCode) { return BeanUtil.copyToList(saasRoleGroupDao.listByCategoryCode(categoryCode), SaasRoleGroupVO.class); } }