From a8d044dcb9919bd49931af25b8e6748aeb5f2ef5 Mon Sep 17 00:00:00 2001
From: xiang <xiang@example.com>
Date: Tue, 23 Sep 2025 22:51:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xservice/auth/server/controller/UserController.java   | 3 ++-
 .../xiang/xservice/auth/service/convert/XUserConvert.java | 5 ++---
 .../xiang/xservice/auth/service/service/XUserService.java | 3 ++-
 .../auth/service/service/impl/XUserServiceImpl.java       | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java
index e662a72..95b0f59 100644
--- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java
+++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java
@@ -1,6 +1,7 @@
 package com.xiang.xservice.auth.server.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
 import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
 import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
 import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
@@ -32,7 +33,7 @@ public class UserController {
     private final XUserService userService;
 
     @PostMapping("/private/user/list")
-    public Result<UserResp> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
+    public Result<PageInfo<UserResp>> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
         return Result.success(userService.getUserList(request));
     }
 
diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XUserConvert.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XUserConvert.java
index 6f82e36..3ef4c92 100644
--- a/xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XUserConvert.java
+++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XUserConvert.java
@@ -1,5 +1,6 @@
 package com.xiang.xservice.auth.service.convert;
 
+import com.github.pagehelper.PageInfo;
 import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
 import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
 import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
@@ -8,8 +9,6 @@ import com.xiang.xservice.auth.service.entity.XUser;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
-
 @Mapper(componentModel = "spring")
 public interface XUserConvert {
     XUserConvert INSTANCE = Mappers.getMapper(XUserConvert.class);
@@ -18,7 +17,7 @@ public interface XUserConvert {
     XUser toDO (UserAddRequest request);
     XUser toDO (UserUpdateRequest request);
 
-    List<UserResp> toRespList(List<XUser> list);
+    PageInfo<UserResp> toPage(PageInfo<XUser> list);
 
     UserResp toResp(XUser user);
 }
diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java
index a559a96..d0f4564 100644
--- a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java
+++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java
@@ -1,5 +1,6 @@
 package com.xiang.xservice.auth.service.service;
 
+import com.github.pagehelper.PageInfo;
 import com.xiang.xservice.auth.api.dto.req.LoginRequest;
 import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
 import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
@@ -22,7 +23,7 @@ public interface XUserService {
 
     RegisterResp userRegister(RegisterRequest request);
 
-    List<UserResp> getUserList(UserQueryRequest request);
+    PageInfo<UserResp> getUserList(UserQueryRequest request);
 
     UserResp getUserInfo(Long id);
 
diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java
index c40c591..990f7e7 100644
--- a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java
+++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java
@@ -1,6 +1,7 @@
 package com.xiang.xservice.auth.service.service.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.xiang.xservice.auth.api.code.Code01UserErrorCode;
 import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
@@ -181,13 +182,14 @@ public class XUserServiceImpl implements XUserService {
     }
 
     @Override
-    public List<UserResp> getUserList(UserQueryRequest request) {
+    public PageInfo<UserResp> getUserList(UserQueryRequest request) {
         PageHelper.startPage(request.getCurrent(), request.getPageSize());
         List<XUser> userList = userMapper.getUserList(userConvert.toDO(request));
         if (CollectionUtils.isEmpty(userList)) {
-            return Lists.newArrayList();
+            return new PageInfo<>();
         }
-        return userConvert.toRespList(userList);
+        PageInfo<XUser> pageInfo = new PageInfo<>(userList);
+        return userConvert.toPage(pageInfo);
     }
 
     @Override