修改

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

@@ -97,14 +97,16 @@ public class UserController {
     }
 
     /**
-     * 新增用户
+     * 新增或修改用户
+     * id 要修改的用户id 修改时传
      * name 用户名
      * phone 电话号码
      * role 角色 0-普通员工 2-管理员
      */
     @RequestMapping("/insertUser")
-    public HttpRespMsg insertUser(@RequestParam String name, @RequestParam String phone, @RequestParam Integer role) {
-        return userService.insertUser(name, phone, role, request);
+    public HttpRespMsg insertUser(String id,
+                                  @RequestParam String name, @RequestParam String phone, @RequestParam Integer role) {
+        return userService.insertUser(id, name, phone, role, request);
     }
 
     /**

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

@@ -30,7 +30,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg insertCompany(String companyName, String name, String phone);
 
-    HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request);
+    HttpRespMsg insertUser(String id, String name, String phone, Integer role, HttpServletRequest request);
 
     HttpRespMsg importUser(MultipartFile multipartFile, HttpServletRequest request);
 

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

@@ -198,37 +198,42 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return httpRespMsg;
     }
 
-    //新增用户
+    //新增或修改用户
     @Override
-    public HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request) {
+    public HttpRespMsg insertUser(String targetId, String name, String phone, Integer role, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User creator = userMapper.selectById(request.getHeader("Token"));
-            //管理员只能新增员工
-            if (creator.getRole() == 2 && role != 0) {
-                httpRespMsg.setError("管理员只能新增普通员工");
-            } else if (role == 3) {
-                httpRespMsg.setError("不可新增负责人");
-            } else {
-                //电话号码列 检测重名
-                if (userMapper.selectList(new QueryWrapper<User>().eq("phone", phone)).size() > 0) {
-                    httpRespMsg.setError("电话号码重复");
+            if (targetId == null) {
+                //新增
+                if (creator.getRole() == 2 && role != 0) {
+                    httpRespMsg.setError("管理员只能新增普通员工");
+                } else if (role == 3) {
+                    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());
-                    if (userMapper.insert(user) == 0) {
-                        httpRespMsg.setError("操作失败");
+                    //电话号码列 检测重名
+                    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());
+                        if (userMapper.insert(user) == 0) {
+                            httpRespMsg.setError("操作失败");
+                        }
                     }
                 }
+            } else {
+                //修改
+                userMapper.updateById(userMapper.selectById(targetId).setName(name).setPhone(phone).setRole(role));
             }
         } catch (NullPointerException e) {
-            httpRespMsg.setError("验证失败");
+            httpRespMsg.setError("数据有误 验证失败");
             return httpRespMsg;
         }
         return httpRespMsg;