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 5abd064e..b3c1a8ce 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 @@ -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> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param); + ApiResult> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param); } 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 41644447..5aa21112 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 @@ -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> pageRoleUserRelation(PageRoleUserRelationReq param) { + public ApiResult> 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))); } }