修改用户改动后无法登录登录Bug

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -156,6 +156,7 @@ public class PersonnelController extends CoreBaseController {
             personnelService.checkSysUserOnly(user);
 
             SysUserInfo userInfo = personnelService.getSysUserInfoById(info.getId());
+            SysUser sysUser = personnelService.getSysUserById(user.getId());
 
             SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId()));
             if (infoDepartment == null) {
@@ -203,17 +204,23 @@ public class PersonnelController extends CoreBaseController {
             userInfo.setUserGrade(info.getUserGrade());
             userInfo.setUserEmployeeType(info.getUserEmployeeType());
 
-            user.setDepartmentId(userDepartment.getId());
-            user.setDepartmentNameRdd(userDepartment.getName());
-            user.setOrganizeId(userOrganize.getId());
-            user.setOrganizeNameRdd(userOrganize.getName());
+            sysUser.setUserLoginName(user.getUserLoginName());
+            sysUser.setLanguageCode(user.getLanguageCode());
+            sysUser.setUserEmail(user.getUserEmail());
+            sysUser.setUserPhone(user.getUserPhone());
+            sysUser.setDepartmentId(userDepartment.getId());
+            sysUser.setDepartmentNameRdd(userDepartment.getName());
+            sysUser.setOrganizeId(userOrganize.getId());
+            sysUser.setOrganizeNameRdd(userOrganize.getName());
 
             // 关系 刷新
-            refreshRef(user, userInfo, model);
+            refreshRef(sysUser, userInfo, model);
             // 更新 密码
-            refreshSysUserPassword(user);
+            if(StringUtils.isNotBlank(user.getUserLoginPassword())){
+                refreshSysUserPassword(sysUser);
+            }
 
-            personnelService.saveSysUser(user);
+            personnelService.saveSysUser(sysUser);
             personnelService.saveSysUserInfo(userInfo);
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -722,6 +729,7 @@ public class PersonnelController extends CoreBaseController {
     public void refreshSysUserPassword(SysUser user) throws Exception {
         if (user != null) {
             if (user.getId() != null) { // 更新密码
+                System.out.println("----> ----> "+!StringUtils.isAnyBlank(user.getUserLoginPassword()));
                 if (!StringUtils.isAnyBlank(user.getUserLoginPassword())) {   // 使用新密码
                     user.setUserLoginPassword(EncryptTool.hexMD5(user.getUserLoginPassword().trim()));
                 } else {  //使用旧密码