From ea90dc0f86cd2e9b8dfa2b5a013c0d7994bd420c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E6=95=8F?= <zhoumin@axzo.cn>
Date: Mon, 30 Sep 2024 15:39:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-3034)=20=E6=94=AF=E6=8C=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=8C=E4=B8=B4=E6=97=B6=E7=94=A8=20step2=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DIPage=E7=9A=84=E8=BF=94=E5=9B=9E=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E8=B0=83=E7=94=A8=E6=96=B9=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java   | 3 ++-
 .../tyr/server/controller/roleuser/RoleUserController.java  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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<IPage<SaasRoleUserRelationDTO>> pageRoleUserRelation(@RequestBody PageRoleUserRelationReq param);
+    ApiResult<PageResp<SaasRoleUserRelationDTO>> 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<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)));
     }
 }