diff --git a/RMS/src/main/java/com/demo/controller/system/RoleController.java b/RMS/src/main/java/com/demo/controller/system/RoleController.java
index 7b259d8511238f3203bc066103309ed0b0059dd7..6ee848b15c69df746432a393c63e6896caa81d0e 100644
--- a/RMS/src/main/java/com/demo/controller/system/RoleController.java
+++ b/RMS/src/main/java/com/demo/controller/system/RoleController.java
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Validated
 @RestController
 @RequestMapping("/system/role")
@@ -30,6 +32,12 @@ public class RoleController {
         roleService.removeById(id);
         return Result.success();
     }
+    // 批量删除
+    @DeleteMapping(value = "/delList")
+    public Result deleteRoleList(@RequestParam List<Integer> id) {
+        roleService.removeByIds(id);
+        return Result.success();
+    }
 
     @PutMapping
     public Result updateRole(@RequestBody Role role) {
diff --git a/RMS/src/main/java/com/demo/controller/system/UserController.java b/RMS/src/main/java/com/demo/controller/system/UserController.java
index 3564225fd4c347a09aa98560fa5f095edcb481a4..effa91695ceacb5a0b33755cc5a9ad6b69b166e8 100644
--- a/RMS/src/main/java/com/demo/controller/system/UserController.java
+++ b/RMS/src/main/java/com/demo/controller/system/UserController.java
@@ -5,6 +5,7 @@ package com.demo.controller.system;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.demo.mapper.system.DeptMapper;
 import com.demo.mapper.system.UserMapper;
 import com.demo.pojo.DTO.DTOUserDept;
@@ -19,6 +20,7 @@ import com.demo.pojo.VO.VOUser;
 import com.demo.service.system.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,13 +37,15 @@ public class UserController {
     private DeptMapper deptMapper;
     // 获取左侧树状图，点击后拿到树状图点击的treePath，显示归属的人员 // 默认进去给个1就能显示全部
     @GetMapping
-    public Result getAllUser(String treePath){
+    public Result getAllUser(String treePath,int currentPage,int pageSize){
         // 拿到tree数字，查询树下的机构id
         List<String> user1 = userMapper.selectDeptTree("%"+treePath+"%");
         // 查询归属于以上机构id的人
         QueryWrapper<User> wrapper = new QueryWrapper<User>()
                 .in("dept_id", user1);
-        List<User> userList = userMapper.selectList(wrapper);
+        Page<User> page = new Page<>(currentPage,pageSize);
+        List<User> userList = userMapper.selectPage(page,wrapper).getRecords();
+        // 用getRecords()这个方法获取page类型内的内容转成list，才能使用list的方法处理数据
         List<VOUser> userList1 = makeUserToVO(userList);
             return Result.success(userList1);
     }
@@ -87,7 +91,9 @@ public class UserController {
     }
     // 模糊查询
     @GetMapping(value = "/getLike")
-    public Result getLike(String need){return Result.success( makeUserToVO(userMapper.selectLikeUser("%"+need+"%")));
+    public Result getLike(String need,int currentPage,int pageSize){
+        Integer firstPage = (currentPage - 1)*pageSize;
+        return Result.success( makeUserToVO(userMapper.selectLikeUser("%"+need+"%",firstPage,pageSize)));
     }
 
     // 递归分层级 部门
diff --git a/RMS/src/main/java/com/demo/mapper/system/UserMapper.java b/RMS/src/main/java/com/demo/mapper/system/UserMapper.java
index 655ef15ec27d772fef40a851dcea420b9668da15..3f3b83bc238930d0e6e19bdfe3eab3b2f630beaf 100644
--- a/RMS/src/main/java/com/demo/mapper/system/UserMapper.java
+++ b/RMS/src/main/java/com/demo/mapper/system/UserMapper.java
@@ -21,8 +21,8 @@ public interface UserMapper extends BaseMapper<User> {
     public List<DTOUserRole> selectAllUserRoleAndRole();
     @Select("select * from sys_dept")
     public List<DTOUserDept> selectAllDept();
-    @Select("select * from sys_user where username like #{need} or name like #{need} or phone like #{need}")
-    public List<User> selectLikeUser(String need);
+    @Select("select * from sys_user where username like #{need} or name like #{need} or phone like #{need} limit #{firstPage},#{pageSize}")
+    public List<User> selectLikeUser(String need,int firstPage,int pageSize);
     @Select("select id from sys_dept where tree_path like #{treePath}")
     public List<String> selectDeptTree(String treePath);
     @Select("select * from sys_user where sys_user.dept_id in (#{user2})")