From 2fb7281d078a71ef809abeada940f52d2392a619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com>
Date: Wed, 2 Apr 2025 16:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=B1=82=E5=88=86=E9=A1=B5=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E5=9B=9E=E4=BD=BF=E7=94=A8ExtendPag?=
 =?UTF-8?q?eData=E3=80=82=E7=AC=A6=E5=90=88=E8=AE=BE=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E4=B9=89=20--AdminController.java=20--SysUse?=
 =?UTF-8?q?rService.java=20--SysUserServiceImpl.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/modules/sys/controller/AdminController.java   | 6 +++---
 .../java/xiaozhi/modules/sys/service/SysUserService.java  | 4 ++--
 .../modules/sys/service/impl/SysUserServiceImpl.java      | 8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
index 5eb48fde..917ae82d 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
@@ -51,7 +51,7 @@ public class AdminController {
             @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
             @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
     })
-    public Result<PageData<AdminPageUserVO>> pageUser(
+    public Result<ExtendPageData<AdminPageUserVO>> pageUser(
             @Parameter(hidden = true) @RequestParam Map<String, Object> params) {
         AdminPageUserDTO dto = new AdminPageUserDTO();
         dto.setMobile((String) params.get("mobile"));
@@ -59,8 +59,8 @@ public class AdminController {
         dto.setPage((String) params.get("pages"));
 
         ValidatorUtils.validateEntity(dto);
-        PageData<AdminPageUserVO> page = sysUserService.page(dto);
-        return new Result<PageData<AdminPageUserVO>>().ok(page);
+        ExtendPageData<AdminPageUserVO> page = sysUserService.page(dto);
+        return new Result<ExtendPageData<AdminPageUserVO>>().ok(page);
     }
 
     @PutMapping("/users/{id}")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
index 1b9ac9bc..dbdf06f0 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
@@ -1,6 +1,6 @@
 package xiaozhi.modules.sys.service;
 
-import xiaozhi.common.page.PageData;
+import xiaozhi.common.page.ExtendPageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.AdminPageUserDTO;
 import xiaozhi.modules.sys.dto.PasswordDTO;
@@ -55,5 +55,5 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      * @param dto 分页查找参数
      * @return 用户列表分页数据
      */
-    PageData<AdminPageUserVO> page(AdminPageUserDTO dto);
+    ExtendPageData<AdminPageUserVO> page(AdminPageUserDTO dto);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
index 043144c4..2335c7e1 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
@@ -18,7 +18,7 @@ import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
-import xiaozhi.common.page.PageData;
+import xiaozhi.common.page.ExtendPageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.agent.service.AgentService;
@@ -151,7 +151,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     }
 
     @Override
-    public PageData<AdminPageUserVO> page(AdminPageUserDTO dto) {
+    public ExtendPageData<AdminPageUserVO> page(AdminPageUserDTO dto) {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(Constant.PAGE, dto.getPage());
         params.put(Constant.LIMIT, dto.getLimit());
@@ -171,7 +171,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             adminPageUserVO.setStatus(user.getStatus().toString());
             return adminPageUserVO;
         }).toList();
-        return new PageData<>(list, page.getTotal());
+        //计算页数
+        long num = page.getTotal() / Long.parseLong(dto.getPage());
+        return new ExtendPageData<>(list, page.getTotal(),num);
     }
 
     private boolean isStrongPassword(String password) {