diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
index 81f12c2..6e1ef6d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
@@ -1,6 +1,5 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.permission.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,8 +17,6 @@ import java.util.List;
  */
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
-    IPage<User> getAll(IPage<User> page);
-
     List<User> getAllWithRoleAndGroup(@Param("userList") List<User> userList);
 
     List<User> getAllAffairUser();
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
index 017f1fd..bb5ded8 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
@@ -92,7 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public IPage<User> getAllUser(Long currentPage, Long pageSize) {
         IPage<User> userPage = PageDTO.of(currentPage, pageSize);
-        userPage = userMapper.getAll(userPage);
+        userPage = userMapper.selectPage(userPage, Wrappers.emptyWrapper());
         userPage.setRecords(userMapper.getAllWithRoleAndGroup(userPage.getRecords()));
         userPage.getRecords().forEach(user -> {
             if (user.getId() == 1L) {
diff --git a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
index 4003c5f..3d77d8e 100644
--- a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
@@ -2,17 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper">
 
-    <select id="getAll" resultMap="userBase">
-        select t_user.id            as user_id,
-               t_user.username      as user_username,
-               t_user.department_id as user_department_id,
-               t_user.enable        as user_enable,
-               t_user.deleted       as user_deleted,
-               t_user.version       as user_version
-        from t_user
-        where deleted = 0
-    </select>
-
     <select id="getAllWithRoleAndGroup" resultMap="userMap">
         select distinct t_user.id as user_id,
         t_user.username as user_username,