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 b3c1a8ce..5fb80f5e 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 @@ -156,5 +156,5 @@ public interface TyrSaasRoleUserApi { * @return */ @PostMapping("/api/roleUserRelation/temporarily/page") - ApiResult> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param); + ApiResult> pageRoleUserRelation(@RequestBody @Valid PageRoleUserRelationReq param); } 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 36af2882..a23b2f86 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 @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import javax.validation.constraints.NotEmpty; import java.util.Date; import java.util.List; import java.util.Set; @@ -24,6 +25,7 @@ public class PageRoleUserRelationReq{ @Builder.Default private Integer pageSize = 20; + @NotEmpty(message = "workspaceOUPairs不能为空") private List workspaceOUPairs; private Date updateAtLE; @@ -32,5 +34,6 @@ public class PageRoleUserRelationReq{ private Boolean includeDelete; + @NotEmpty(message = "roleIds不能为空") private Set roleIds; } 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 989639a7..d11e5dc2 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 @@ -210,7 +210,7 @@ public class RoleUserController implements TyrSaasRoleUserApi { List saasRoleUserRelationDTOS = listNormalUser(param); if (BooleanUtils.isTrue(param.getIncludeDelete())) { - List deleteUsers = saasRoleUserRelationMapper.pageRoleUserRelation(page, param).getRecords(); + List deleteUsers = saasRoleUserRelationMapper.pageRoleUserRelation(param); saasRoleUserRelationDTOS.addAll(deleteUsers); } @@ -220,7 +220,7 @@ public class RoleUserController implements TyrSaasRoleUserApi { private List listNormalUser(PageRoleUserRelationReq param) { if (CollectionUtils.isEmpty(param.getRoleIds()) && CollectionUtils.isEmpty(param.getWorkspaceOUPairs())) { - return Collections.emptyList(); + return Lists.newArrayList(); } return saasRoleUserRelationService.listV2(ListRoleUserRelationParam.builder() diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java index a0e958f7..d94b0b9a 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java @@ -1,6 +1,5 @@ package cn.axzo.tyr.server.repository.mapper; -import cn.axzo.foundation.page.PageResp; import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserRelationDTO; import cn.axzo.tyr.client.model.roleuser.req.PageRoleUserRelationReq; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; @@ -14,6 +13,7 @@ import lombok.NoArgsConstructor; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Set; @Mapper @@ -34,7 +34,7 @@ public interface SaasRoleUserRelationMapper extends BaseMapper pageRoleUserRelation(IPage page, @Param("param") PageRoleUserRelationReq param); + List pageRoleUserRelation(@Param("param") PageRoleUserRelationReq param); @Data @Builder