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