From 5d528350ce7aef423f880c0380d94061a5777367 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 2 Aug 2019 15:10:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20Bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/apiservice/controller/busi/PersonnelController.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 86a82f6..5879ea9 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
@@ -212,6 +212,7 @@ 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());
@@ -222,7 +223,7 @@ public class PersonnelController extends CoreBaseController {
             // 关系 刷新
             refreshRef(sysUser, userInfo, model);
             // 更新 密码
-            if(StringUtils.isNotBlank(user.getUserLoginPassword())){
+            if(StringUtils.isNotBlank(sysUser.getUserLoginPassword())){
                 refreshSysUserPassword(sysUser);
             }
 

From c10b7b06639f2b6c86833522a210ad4d5a21bc1c Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 5 Aug 2019 20:33:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/apiservice/controller/busi/PersonnelController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 5879ea9..10cbde7 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/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);
             }