From 316b697fc55e8cfc765371542f6dad3a46026bd5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Mon, 24 Feb 2025 10:06:50 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B2=A1=E8=87=AA=E5=8A=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/system/controller/user/UserController.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
index ebbbdbd20..1f19f46cf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
@@ -21,6 +21,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.RequiredArgsConstructor;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -32,6 +34,7 @@ import org.nl.modules.logging.annotation.Log;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.user.ISysUserService;
 import org.nl.system.service.user.dao.SysUser;
+import org.nl.system.service.user.dto.SysUserDetail;
 import org.nl.system.service.user.dto.UserQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -39,6 +42,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -58,7 +62,11 @@ public class UserController {
 
     @GetMapping
     public ResponseEntity<Object> query(UserQuery query, PageQuery page) {
-        return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)), HttpStatus.OK);
+        Page<Object> startPage = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<SysUserDetail> userDetail = userService.getUserDetail(query, page);
+        TableDataInfo<SysUserDetail> build = TableDataInfo.build(userDetail);
+        build.setTotalElements(startPage.getTotal());
+        return new ResponseEntity(build, HttpStatus.OK);
     }
 
     @Log("新增用户")