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

feat: (feature/REQ-3034) 修改临时接口支持已删除和未删除的同时查询

Browse Source
This commit is contained in:
lilong 2024-10-14 09:53:22 +08:00
parent bed47b058b
commit abc4445fec
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
View File

@ -156,5 +156,5 @@ public interface TyrSaasRoleUserApi {
* @return * @return
*/ */
@PostMapping("/api/roleUserRelation/temporarily/page") @PostMapping("/api/roleUserRelation/temporarily/page")
ApiResult<PageResp<SaasRoleUserRelationDTO>> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param); ApiResult<PageResp<SaasRoleUserRelationDTO>> pageRoleUserRelation(@RequestBody @Valid PageRoleUserRelationReq param);
} }

3
tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java
View File

@ -8,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import javax.validation.constraints.NotEmpty;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -24,6 +25,7 @@ public class PageRoleUserRelationReq{
@Builder.Default @Builder.Default
private Integer pageSize = 20; private Integer pageSize = 20;
@NotEmpty(message = "workspaceOUPairs不能为空")
private List<WorkspaceOUPair> workspaceOUPairs; private List<WorkspaceOUPair> workspaceOUPairs;
private Date updateAtLE; private Date updateAtLE;
@ -32,5 +34,6 @@ public class PageRoleUserRelationReq{
private Boolean includeDelete; private Boolean includeDelete;
@NotEmpty(message = "roleIds不能为空")
private Set<Long> roleIds; private Set<Long> roleIds;
} }

4
tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
View File

@ -210,7 +210,7 @@ public class RoleUserController implements TyrSaasRoleUserApi {
List<SaasRoleUserRelationDTO> saasRoleUserRelationDTOS = listNormalUser(param); List<SaasRoleUserRelationDTO> saasRoleUserRelationDTOS = listNormalUser(param);
if (BooleanUtils.isTrue(param.getIncludeDelete())) { if (BooleanUtils.isTrue(param.getIncludeDelete())) {
List<SaasRoleUserRelationDTO> deleteUsers = saasRoleUserRelationMapper.pageRoleUserRelation(page, param).getRecords(); List<SaasRoleUserRelationDTO> deleteUsers = saasRoleUserRelationMapper.pageRoleUserRelation(param);
saasRoleUserRelationDTOS.addAll(deleteUsers); saasRoleUserRelationDTOS.addAll(deleteUsers);
} }
@ -220,7 +220,7 @@ public class RoleUserController implements TyrSaasRoleUserApi {
private List<SaasRoleUserRelationDTO> listNormalUser(PageRoleUserRelationReq param) { private List<SaasRoleUserRelationDTO> listNormalUser(PageRoleUserRelationReq param) {
if (CollectionUtils.isEmpty(param.getRoleIds()) && CollectionUtils.isEmpty(param.getWorkspaceOUPairs())) { if (CollectionUtils.isEmpty(param.getRoleIds()) && CollectionUtils.isEmpty(param.getWorkspaceOUPairs())) {
return Collections.emptyList(); return Lists.newArrayList();
} }
return saasRoleUserRelationService.listV2(ListRoleUserRelationParam.builder() return saasRoleUserRelationService.listV2(ListRoleUserRelationParam.builder()

4
tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java
View File

@ -1,6 +1,5 @@
package cn.axzo.tyr.server.repository.mapper; 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.dto.SaasRoleUserRelationDTO;
import cn.axzo.tyr.client.model.roleuser.req.PageRoleUserRelationReq; import cn.axzo.tyr.client.model.roleuser.req.PageRoleUserRelationReq;
import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set; import java.util.Set;
@Mapper @Mapper
@ -34,7 +34,7 @@ public interface SaasRoleUserRelationMapper extends BaseMapper<SaasRoleUserRelat
* @param param * @param param
* @return * @return
*/ */
IPage<SaasRoleUserRelationDTO> pageRoleUserRelation(IPage<SaasRoleUserRelation> page, @Param("param") PageRoleUserRelationReq param); List<SaasRoleUserRelationDTO> pageRoleUserRelation(@Param("param") PageRoleUserRelationReq param);
@Data @Data
@Builder @Builder