wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(2046) 修改批量获取权限分组接口

Browse Source
This commit is contained in:
TanJ 2024-01-13 17:41:48 +08:00
parent fb29af7950
commit aef8a7778e
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
View File

@ -54,12 +54,12 @@ public interface SaasRoleGroupApi {
/** /**
* *
* 通过categoryCode查询分组 * 通过categoryCode查询分组
* @param categoryCode #{@link cn.axzo.tyr.client.common.enums.SaasPositionEnum} * @param categoryCodes #{@link cn.axzo.tyr.client.common.enums.SaasPositionEnum}
* *
* @return * @return
*/ */
@GetMapping("/api/saasRoleGroup/listByCategoryCode") @GetMapping("/api/saasRoleGroup/listByCategoryCode")
ApiResult<List<SaasRoleGroupVO>> listByCategoryCode(@RequestParam("categoryCode") String categoryCode); ApiResult<List<SaasRoleGroupVO>> listByCategoryCode(@RequestParam("categoryCode") List<String> categoryCodes);
} }

2
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
View File

@ -52,7 +52,7 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
} }
@Override @Override
public ApiResult<List<SaasRoleGroupVO>> listByCategoryCode(String categoryCode) { public ApiResult<List<SaasRoleGroupVO>> listByCategoryCode(List<String> categoryCode) {
return ApiResult.ok(saasRoleGroupService.listByCategoryCode(categoryCode)); return ApiResult.ok(saasRoleGroupService.listByCategoryCode(categoryCode));
} }

6
tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java
View File

@ -51,9 +51,9 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
.update(); .update();
} }
public List<SaasRoleGroup> listByCategoryCode(String categoryCode) { public List<SaasRoleGroup> listByCategoryCode(List<String> categoryCode) {
return lambdaQuery().eq(BaseEntity::getIsDelete, 0L) return lambdaQuery().eq(BaseEntity::getIsDelete, 0L)
.eq(StrUtil.isNotBlank(categoryCode), SaasRoleGroup::getCategoryCode, categoryCode).list(); .in(SaasRoleGroup::getCategoryCode, categoryCode).list();
} }
} }

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleGroupService.java
View File

@ -31,5 +31,5 @@ public interface SaasRoleGroupService {
* @param categoryCode * @param categoryCode
* @return * @return
*/ */
List<SaasRoleGroupVO> listByCategoryCode(String categoryCode); List<SaasRoleGroupVO> listByCategoryCode(List<String> categoryCode);
} }

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
View File

@ -7,7 +7,6 @@ import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import cn.axzo.pokonyan.util.KeysUtil; import cn.axzo.pokonyan.util.KeysUtil;
import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum; import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum;
import cn.axzo.tyr.client.common.enums.RoleTypeEnum; 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.BaseWorkspaceModel;
import cn.axzo.tyr.client.model.enums.IdentityType; import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum; import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum;
@ -359,8 +358,8 @@ public class RoleUserService implements SaasRoleUserService {
if (CollectionUtil.isEmpty(roleUserBaseInfo.getRoleUserResourceInfos())) { if (CollectionUtil.isEmpty(roleUserBaseInfo.getRoleUserResourceInfos())) {
throw new ServiceException("grant team manager error, not found person info"); throw new ServiceException("grant team manager error, not found person info");
} }
if (CollectionUtil.isEmpty(saasPgroupRoleRelations)) { if (CollectionUtil.isEmpty(saasPgroupRoleRelations)) {
log.warn("warn: grant team manager permission error, not found permissions info");
// 未指定授权哪些角色 // 未指定授权哪些角色
return; return;
} }
@ -414,7 +413,7 @@ public class RoleUserService implements SaasRoleUserService {
if (StrUtil.isBlank(categoryCode)) { if (StrUtil.isBlank(categoryCode)) {
throw new ServiceException("不支持清除该人员所有角色，请指定分组"); throw new ServiceException("不支持清除该人员所有角色，请指定分组");
} }
List<SaasRoleGroupVO> saasRoleGroupVO = saasRoleGroupService.listByCategoryCode(categoryCode); List<SaasRoleGroupVO> saasRoleGroupVO = saasRoleGroupService.listByCategoryCode(Lists.newArrayList(categoryCode));
List<SaasRoleGroupRelation> roleGroupRelations = saasRoleGroupRelationDao.findByGroupId(saasRoleGroupVO.stream().map(SaasRoleGroupVO::getId).collect(Collectors.toSet())); List<SaasRoleGroupRelation> roleGroupRelations = saasRoleGroupRelationDao.findByGroupId(saasRoleGroupVO.stream().map(SaasRoleGroupVO::getId).collect(Collectors.toSet()));
Set<Long> roleIds = roleGroupRelations.stream().map(SaasRoleGroupRelation::getRoleId).collect(Collectors.toSet()); Set<Long> roleIds = roleGroupRelations.stream().map(SaasRoleGroupRelation::getRoleId).collect(Collectors.toSet());
if (CollectionUtil.isEmpty(roleIds)) { if (CollectionUtil.isEmpty(roleIds)) {

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java
View File

@ -160,7 +160,7 @@ public class SaasRoleGroupServiceImpl implements SaasRoleGroupService {
} }
@Override @Override
public List<SaasRoleGroupVO> listByCategoryCode(String categoryCode) { public List<SaasRoleGroupVO> listByCategoryCode(List<String> categoryCode) {
return BeanUtil.copyToList(saasRoleGroupDao.listByCategoryCode(categoryCode), SaasRoleGroupVO.class); return BeanUtil.copyToList(saasRoleGroupDao.listByCategoryCode(categoryCode), SaasRoleGroupVO.class);
} }
} }