用户新增修改

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

@@ -631,12 +631,9 @@ public class SysUserController extends BaseController
 
         String password = configService.selectConfigByKey("sys.user.initPassword");
         SysUser queryUser = userService.selectUserByUserName(user.getUserName());
-
-        //查询用户是否存在
-        Map useMap = new HashMap();
-        useMap.put("userName",user.getUserName());
-        List<Map> listNormalUser = userService.selectNormalUser(useMap);
+        boolean flag = false;
         if(queryUser != null){
+            flag = true;
            //获取用户Id
            Long userId = queryUser.getUserId();
            //查询此企业是否存在此用户
@@ -652,6 +649,7 @@ public class SysUserController extends BaseController
             user.setPassword(SecurityUtils.encryptPassword(password));
             user.setCreateBy(SecurityUtils.getUsername());
             userMapper.insertUser(user);
+            queryUser = user;
         }
 
         Long[] roles = user.getRoleIds();
@@ -698,7 +696,7 @@ public class SysUserController extends BaseController
 //                "医疗招商、医疗集采、供应链金融等企业级服务，如果您再平台使用中遇到任何问题，" +
 //                "请再首页查看并拨打平台客服专线电话，我们将竭尽所能为您提供免费的咨询服务";
 //        remoteSystemService.sendNotice(use.getCompanyId(),use.getCompanyId(),tittle,"01","00",null,"0",String.valueOf(queryUser.getUserId()),null);
-        if (queryUser == null) {
+        if (!flag) {
             Map passwordMap =new HashMap();
             passwordMap.put("password",SecurityUtils.encryptPassword(password));
             messageUtilsService.sendMessageCode(user.getPhonenumber(),zhucechenggong,passwordMap,null);