From f14bfdc6474bf65e75767fa3927f7bf6f12d493a Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 4 May 2023 18:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/sys/controller/SysUserController.java   | 8 +++++---
 .../java/com/qs/serve/modules/sys/entity/SysUser.java     | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
index 0a8ddc6c..9e6a8187 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
@@ -3,6 +3,7 @@ package com.qs.serve.modules.sys.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.consts.GySysConst;
@@ -152,16 +153,17 @@ public class SysUserController {
      * @param param
      * @return
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     @PreAuthorize("hasRole('sys:user:query')")
-    public R<PageVo<SysUser>> getPage(SysUser param){
+    public R<PageVo<SysUser>> getPage(@RequestBody SysUser param){
         param.setTenantId(AuthContextUtils.getTenant());
         if(CollectionUtil.isNotEmpty(param.getMultiDeptIds()) && param.getLoadChildDept()!=null && param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)){
             List<SysDept> deptList = sysDeptService.listDeptByIds(param.getMultiDeptIds(),param.getLoadChildDept().equals(GySysConst.STATUS_YES_1));
             List<String> deptIds = deptList.stream().map(SysDept::getId).distinct().collect(Collectors.toList());
             param.setMultiDeptIds(deptIds);
         }
-        PageUtil.startPage();
+        //PageUtil.startPage();
+        PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<SysUser> list = sysUserService.listUser(param);
         //前端页面展示参数
         list.forEach(a->sysUserService.relateInfo(a,false));
diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
index bb0b45d0..8d3f82d4 100644
--- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
+++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
@@ -188,6 +188,13 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private Object leaveInfo;
 
+
+    @TableField(exist = false)
+    private Integer pageNum;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+
     /**
      * 返回前端，过滤敏感信息
      * @return