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

feat:(REQ-3034) 支持查询被删除的 用户，临时用 step2 修复IPage的返回参数，调用方无法反序列化的问题

Browse Source
This commit is contained in:
周敏 2024-09-30 15:39:35 +08:00
parent 1468582e58
commit ea90dc0f86
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package cn.axzo.tyr.client.feign;
import cn.axzo.foundation.page.PageResp;
import cn.axzo.framework.domain.web.result.ApiPageResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.roleuser.RoleUserUpdateReq;
@ -155,5 +156,5 @@ public interface TyrSaasRoleUserApi {
* @return
*/
@PostMapping("/api/roleUserRelation/temporarily/page")
ApiResult<IPage<SaasRoleUserRelationDTO>> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param);
ApiResult<PageResp<SaasRoleUserRelationDTO>> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param);
}

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

@ -1,6 +1,8 @@
package cn.axzo.tyr.server.controller.roleuser;
import cn.axzo.basics.common.util.AssertUtil;
import cn.axzo.foundation.dao.support.converter.PageConverter;
import cn.axzo.foundation.page.PageResp;
import cn.axzo.framework.domain.web.result.ApiPageResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
@ -197,8 +199,8 @@ public class RoleUserController implements TyrSaasRoleUserApi {
}
@Override
public ApiResult<IPage<SaasRoleUserRelationDTO>> pageRoleUserRelation(PageRoleUserRelationReq param) {
public ApiResult<PageResp<SaasRoleUserRelationDTO>> pageRoleUserRelation(PageRoleUserRelationReq param) {
IPage page = new Page<>(param.getPage(), param.getPageSize());
return ApiResult.ok(saasRoleUserRelationMapper.pageRoleUserRelation(page, param));
return ApiResult.ok(PageConverter.toResp(saasRoleUserRelationMapper.pageRoleUserRelation(page, param)));
}
}