From 850684545c7f7130f87ada30927c3a7503ba3b5c Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 2 Jun 2021 18:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=EF=BC=9A=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E8=AF=A5=E7=94=A8=E6=88=B7=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=99=BB=E5=BD=95=E6=97=B6=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-apiservice/.DS_Store                 | Bin 0 -> 6148 bytes
 .../apiservice/controller/busi/PersonnelController.java  |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-core-apiservice/.DS_Store

diff --git a/modules/i3plus-core-apiservice/.DS_Store b/modules/i3plus-core-apiservice/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..05740a14bf7f6f46ef9751656dac66f6ffcca289
GIT binary patch
literal 6148
zcmeHK!EVz)5S?v8vk5}vfJB9a<O{bFB@|U~Kr*2mdP6dT1EAJUtk#n2jcli(4MD#1
z1@IGm2VcOqaDq3x8$=vHoDiZr((D`0&dhqBwYy#-62s|uK-48731w_{(ELQWpLI<(
ztfvJOy2g|Wx=kZel&?iQhhxAo@UJnzYxf2vv_lh0>BsdOV<m_1CRo!k*7GT>5v(5Y
zgwp*~jiOXV$mh-DA++~Z3oL9VsHW(Midx*qT3ibwDAeoG>-DPQW-YpbcgbnAT2s8M
zMQu`vH_tJ8Ol2+h%kN^NSuwG5`V>vlq$vCS&tjv|ytLVpvLicJI<JCbH4DnHoEF0{
zf5A^r!tyw>_EV+O?{*kHOXAr<_u3<sm0^;_xlT^TF+yHGPqML^4b?Oo7rIVhI;3pN
z_Ca@RJ|Fb^+uq&Xdy8#ve*X^JJG+ZTTVB64c(8wXa&|s{vv~U+6M_hAz*??aT*3z!
zD}<Z|d6uf|2>xZxGS=aRV!(cWdHF)k+D+Cm;28K526%t)pp3r7%Anpl(C8}wunD&o
z*!(-dIi5w|Vr39L5Mfe*CRNxghA`>ydp6FuSQ#|wB<$rw*pY?3p$I)X>U%nzgm2Kb
zjseHODgzDk*yZ#8@vrayt4Z$3G2j^ZuNV-`y<l&MDcQ4iZE}3pdeB2C3&&LkbqX4L
h9BYG*;w`8a^m%LmeT$Vrcp&aaK-1tF$G~4@;2XyPl!*WU

literal 0
HcmV?d00001

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 eb54640..2e9a27f 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
@@ -152,7 +152,8 @@ public class PersonnelController extends CoreBaseController {
             user.setOrganizeNameRdd(userOrganize.getName());
             user.setOrganizeCode(userOrganize.getOrganizeCode());
             user.setUserInfoId(info.getId());
-            user.setUserPasswordLastModifyTime(TimeTool.getNowTime(true));
+            //松下需要创建的新用户 第一次登陆系统就要重置密码
+//            user.setUserPasswordLastModifyTime(TimeTool.getNowTime(true));
             refreshSysUserPassword(user);
             SysUser userSaved=personnelService.saveSysUser(user);