Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

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

@@ -212,7 +212,6 @@ public class PersonnelController extends CoreBaseController {
             sysUser.setLanguageCode(user.getLanguageCode());
             sysUser.setUserEmail(user.getUserEmail());
             sysUser.setUserPhone(user.getUserPhone());
-            sysUser.setUserLoginPassword(user.getUserLoginPassword());
             sysUser.setDepartmentId(userDepartment.getId());
             sysUser.setDepartmentNameRdd(userDepartment.getName());
             sysUser.setOrganizeId(userOrganize.getId());
@@ -223,7 +222,8 @@ public class PersonnelController extends CoreBaseController {
             // 关系 刷新
             refreshRef(sysUser, userInfo, model);
             // 更新 密码
-            if(StringUtils.isNotBlank(sysUser.getUserLoginPassword())){
+            if(StringUtils.isNotBlank(user.getUserLoginPassword())){
+                sysUser.setUserLoginPassword(user.getUserLoginPassword());
                 refreshSysUserPassword(sysUser);
             }