From d299ced749265fb46503efce23d1bac0fe45352d Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Wed, 26 Mar 2025 19:49:43 +0800
Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/odboy/modules/system/mapper/UserMapper.java  | 2 --
 .../cn/odboy/modules/system/service/impl/UserServiceImpl.java | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/UserMapper.java
index ccf1c43b..0081ea65 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/UserMapper.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/UserMapper.java
@@ -18,8 +18,6 @@ public interface UserMapper extends BaseMapper<User> {
 
     Long countAll(@Param("criteria") UserQueryCriteria criteria);
 
-    List<User> findAll(@Param("criteria") UserQueryCriteria criteria);
-
     IPage<User> findAll(@Param("criteria") UserQueryCriteria criteria, Page<Object> page);
 
     User findByUsername(@Param("username") String username);
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java
index 3151a75e..53a70059 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java
@@ -45,14 +45,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public PageResult<User> queryAll(UserQueryCriteria criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
-        List<User> users = userMapper.findAll(criteria);
+        List<User> users = userMapper.findAll(criteria, PageUtil.getCount(userMapper)).getRecords();
         Long total = userMapper.countAll(criteria);
         return PageUtil.toPage(users, total);
     }
 
     @Override
     public List<User> queryAll(UserQueryCriteria criteria) {
-        return userMapper.findAll(criteria);
+        return userMapper.findAll(criteria, PageUtil.getCount(userMapper)).getRecords();
     }
 
     @Override