diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java index ff593e25..06a3e55a 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java @@ -57,7 +57,7 @@ public interface TyrSaasRoleApi { ApiResult delete(@RequestBody List id); /** - * 根据身份id身份类型查询权限列表(批量) + * 根据身份id身份类型查询权限列表(只返回角色信息) * @param identityType 身份类型 1:工人 2:班组长 3:从业人员 4:监管人员 5:运营人员 * @return */ @@ -65,7 +65,7 @@ public interface TyrSaasRoleApi { ApiResult> queryByIdentityIdType(@RequestParam(required = true) Long identityId,@RequestParam(required = true) Integer identityType,@RequestParam(required = true) Long workspaceId,@RequestParam(required = true) Long ouId); /** - * 根据身份id身份类型查询权限列表(批量) + * 根据身份id身份类型查询权限列表(批量,只返回角色信息) * @return */ @PostMapping("/api/saasRole/queryBatchByIdentityIdType") diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java index 21960164..b4ea91fa 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java @@ -66,7 +66,7 @@ public class SaasRoleController implements TyrSaasRoleApi { @Override public ApiResult> queryByIdentityIdType(Long identityId, Integer identityType,Long workspaceId,Long ouId) { - return ApiResult.ok(roleService.queryByIdentityIdType(identityId, identityType,workspaceId,ouId)); + return ApiResult.ok(roleService.queryByIdentityIdType(identityId, identityType,workspaceId,ouId, false)); } @Override diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java index af2ad213..db146fa5 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java @@ -25,7 +25,7 @@ import java.util.Set; public interface RoleService { - List queryByIdentityIdType(Long identityId, Integer identityType,Long workspaceId,Long ouId); + List queryByIdentityIdType(Long identityId, Integer identityType,Long workspaceId,Long ouId, Boolean includePermissionGroup); List query(QuerySaasRoleReq req); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java index da51ec43..ada76ca1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java @@ -76,13 +76,13 @@ public class RoleServiceImpl implements RoleService { SaasRoleUserRelationDao saasRoleUserRelationDao; @Override - public List queryByIdentityIdType(Long identityId, Integer identityType, Long workspaceId, Long ouId) { + public List queryByIdentityIdType(Long identityId, Integer identityType, Long workspaceId, Long ouId, Boolean includePermissionGroup) { // 查询人关联的角色id List roleIds = roleUserRelationDao.query(identityId, identityType, workspaceId, ouId).stream().map(SaasRoleUserRelation::getRoleId).collect(Collectors.toList()); if (CollectionUtils.isEmpty(roleIds)) { return new ArrayList<>(); } - return getByIds(roleIds, null, null,null, false); + return getByIds(roleIds, null, null,null, includePermissionGroup); } /** @@ -194,14 +194,13 @@ public class RoleServiceImpl implements RoleService { @Override public List queryBatchByIdentityIdType(List req) { List result = new ArrayList<>(); - req.forEach(e -> { result.add(QueryBatchByIdentityIdTypeRes.builder() .identityId(e.getIdentityId()) .identityType(e.getIdentityType()) .workspaceId(e.getWorkspaceId()) .ouId(e.getOuId()) - .role(queryByIdentityIdType(e.getIdentityId(),e.getIdentityType(),e.getWorkspaceId(),e.getOuId())) + .role(queryByIdentityIdType(e.getIdentityId(),e.getIdentityType(),e.getWorkspaceId(),e.getOuId(),false)) .build()); }); return result;