diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java index a23b2f86..5b017f3a 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java @@ -34,6 +34,8 @@ public class PageRoleUserRelationReq{ private Boolean includeDelete; - @NotEmpty(message = "roleIds不能为空") +// @NotEmpty(message = "roleIds不能为空") private Set roleIds; + + private Set personIds; } 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 03637425..80227edc 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 @@ -348,24 +348,29 @@ public class RoleUserController implements TyrSaasRoleUserApi { } return saasRoleUserRelationService.listV2(ListRoleUserRelationParam.builder() - .roleIds(Lists.newArrayList(param.getRoleIds())) - .workspaceOuPairs(Optional.ofNullable(param.getWorkspaceOUPairs()) - .map(e -> e.stream().map(f -> ListRoleUserRelationParam.WorkspaceOuPair.builder() - .workspaceId(f.getWorkspaceId()) - .ouId(f.getOuId()) - .build()) - .collect(Collectors.toList())) - .orElse(null)) - .build()) - .stream() - .map(e -> { - SaasRoleUserRelationDTO saasRoleUserRelationDTO = SaasRoleUserRelationDTO.builder().build(); - BeanUtils.copyProperties(e, saasRoleUserRelationDTO); - saasRoleUserRelationDTO.setId(e.getId()); - saasRoleUserRelationDTO.setNaturalPersonId(e.getSaasRoleUser().getPersonId()); - return saasRoleUserRelationDTO; - }) - .collect(Collectors.toList()); + .roleIds(Optional.ofNullable(param.getRoleIds()) + .map(Lists::newArrayList) + .orElse(null)) + .personIds(Optional.ofNullable(param.getPersonIds()) + .map(Lists::newArrayList) + .orElse(null)) + .workspaceOuPairs(Optional.ofNullable(param.getWorkspaceOUPairs()) + .map(e -> e.stream().map(f -> ListRoleUserRelationParam.WorkspaceOuPair.builder() + .workspaceId(f.getWorkspaceId()) + .ouId(f.getOuId()) + .build()) + .collect(Collectors.toList())) + .orElse(null)) + .build()) + .stream() + .map(e -> { + SaasRoleUserRelationDTO saasRoleUserRelationDTO = SaasRoleUserRelationDTO.builder().build(); + BeanUtils.copyProperties(e, saasRoleUserRelationDTO); + saasRoleUserRelationDTO.setId(e.getId()); + saasRoleUserRelationDTO.setNaturalPersonId(e.getSaasRoleUser().getPersonId()); + return saasRoleUserRelationDTO; + }) + .collect(Collectors.toList()); } @Override diff --git a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml index 1a984d92..b5c71a6c 100644 --- a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml +++ b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml @@ -61,6 +61,13 @@ + + AND t1.natural_person_id IN + + #{item} + + +