人员分页

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -59,10 +59,12 @@ public class UserController {
 
     /**
      * 获取员工的列表
+     * pageIndex 页面索引
+     * pageSize 页面大小
      */
     @RequestMapping("/getEmployeeList")
-    public HttpRespMsg getEmployeeList() {
-        return userService.getEmployeeList(request);
+    public HttpRespMsg getEmployeeList(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
+        return userService.getEmployeeList(pageIndex, pageSize, request);
     }
 
     /**
@@ -102,6 +104,7 @@ public class UserController {
      * name 用户名
      * phone 电话号码
      * role 角色 0-普通员工 2-管理员
+     * cost 成本
      */
     @RequestMapping("/insertUser")
     public HttpRespMsg insertUser(String id, @RequestParam String name, @RequestParam String phone,

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -22,7 +22,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg getUserInfo(String id);
 
-    HttpRespMsg getEmployeeList(HttpServletRequest request);
+    HttpRespMsg getEmployeeList(Integer pageIndex, Integer pageSize, HttpServletRequest request);
 
     HttpRespMsg deleteUser(String userId, HttpServletRequest request);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.Company;
 import com.management.platform.entity.User;
@@ -151,12 +152,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //获取员工的列表
     @Override
-    public HttpRespMsg getEmployeeList(HttpServletRequest request) {
+    public HttpRespMsg getEmployeeList(Integer pageIndex, Integer pageSize, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User requester = userMapper.selectById(request.getHeader("Token"));
-            //获取本公司除负责人以外全部的信息
-            httpRespMsg.data = userMapper.selectList(new QueryWrapper<User>()
+            httpRespMsg.data = userMapper.selectPage(new Page<>(pageIndex, pageSize), new QueryWrapper<User>()
                     .eq("company_id", requester.getCompanyId()));
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
@@ -267,21 +267,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if (userMapper.selectList(new QueryWrapper<User>().eq("phone", phone)).size() > 0) {
                         httpRespMsg.setError("电话号码重复");
                     } else {
-                        Long id = SnowFlake.nextId();
-                        User user = new User()
-                                .setId(id.toString())
-                                .setName(name)
-                                .setPassword(MD5Util.getPassword("000000"))
-                                .setPhone(phone)
-                                .setRole(role)
-                                .setCompanyId(creator.getCompanyId())
-                                .setCost(costValue);
                         if (userMapper.selectCount(new QueryWrapper<User>()
                                 .eq("company_id", creator.getCompanyId())) >=
                                 (companyMapper.selectById(creator.getCompanyId()).getStaffCountMax())) {
                             httpRespMsg.setError("公司人员已达上限");
-                        }else if (userMapper.insert(user) == 0) {
-                            httpRespMsg.setError("操作失败");
+                        } else {
+                            Long id = SnowFlake.nextId();
+                            User user = new User()
+                                    .setId(id.toString())
+                                    .setName(name)
+                                    .setPassword(MD5Util.getPassword("000000"))
+                                    .setPhone(phone)
+                                    .setRole(role)
+                                    .setCompanyId(creator.getCompanyId())
+                                    .setCost(costValue);
+                            if (userMapper.insert(user) == 0) {
+                                httpRespMsg.setError("操作失败");
+                            }
                         }
                     }
                 }