1.修改员工编号重复问题

suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java

@@ -161,22 +161,23 @@ public class SysUserController extends BaseController
         {
             return error("密码长度为6-19，请重新设置！！");
         }
-        user.setSalt(ShiroSaltUtil.randomSalt());
-        user.setPassword(EncryptPassWordClass.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        user.setCreateBy(ShiroUtils.getLoginName());
-        int userId = userService.insertUser(user);
         if(user.getSysUserExt()!=null){
             SysUserExt ext =user.getSysUserExt();
-            ext.setUserId(user.getUserId());
             //查询当前的员工编号是否存在
             int ext1 = userExtService.selectSysUserExtBySapEmployeeId(ext.getSapEmployeeId());
             if(ext1 >0){
                 return error("员工编号已存在");
             }
+        }
+        user.setSalt(ShiroSaltUtil.randomSalt());
+        user.setPassword(EncryptPassWordClass.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
+        user.setCreateBy(ShiroUtils.getLoginName());
+        int userId = userService.insertUser(user);
+        if(user.getSysUserExt()!=null) {
+            SysUserExt ext = user.getSysUserExt();
+            ext.setUserId(user.getUserId());
             userExtService.insertOrUpSysUserExt(ext);
-
         }
-
         return toAjax(userId);
     }