用户相关

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -632,6 +632,7 @@ public class SysUserController extends BaseController
         }
 
         String password = configService.selectConfigByKey("sys.user.initPassword");
+        SysUser queryUser = userService.selectUserByUserName(user.getUserName());
 
         //查询用户是否存在
         Map useMap = new HashMap();
@@ -649,13 +650,14 @@ public class SysUserController extends BaseController
                 return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，用户已存在");
             }
         } else{
-            user.setStatus("0");
-            user.setPassword(SecurityUtils.encryptPassword(password));
-            user.setCreateBy(SecurityUtils.getUsername());
-            userMapper.insertUser(user);
+            if(queryUser == null) {
+                user.setStatus("0");
+                user.setPassword(SecurityUtils.encryptPassword(password));
+                user.setCreateBy(SecurityUtils.getUsername());
+                userMapper.insertUser(user);
+            }
         }
 
-        SysUser queryUser = userService.selectUserByUserName(user.getUserName());
         Long[] roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles))
         {