From c191deb51e00064a89c122284490316e49a87c83 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Mon, 1 Mar 2021 15:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=86=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/config/update.html    | 34 +++++++++----------
 .../wgink/service/user/pojo/pos/UserPO.java   | 11 ++++++
 .../user/service/impl/UserServiceImpl.java    |  7 ++--
 .../resources/mybatis/mapper/user-mapper.xml  |  1 +
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html
index fcda038d..2f2f4147 100644
--- a/login-base/src/main/resources/templates/config/update.html
+++ b/login-base/src/main/resources/templates/config/update.html
@@ -114,6 +114,23 @@
                 </div>
             </div>
         </div>
+        <div class="layui-card">
+            <div class="layui-card-header">
+                <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
+                    <a href="javascript:void(0);"><cite>用户首次登录修改密码（该功能需设置密码有效期）</cite></a>
+                </span>
+            </div>
+            <div class="layui-card-body" style="padding: 15px;">
+                <div class="layui-form-item">
+                    <div>
+                        <input type="radio" name="firstLoginChangePassword" value="close" title="关闭" checked>
+                    </div>
+                    <div>
+                        <input type="radio" name="firstLoginChangePassword" value="open" title="开通">
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="layui-card">
             <div class="layui-card-header">
                 <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
@@ -149,23 +166,6 @@
                 </div>
             </div>
         </div>
-        <div class="layui-card">
-            <div class="layui-card-header">
-                <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
-                    <a href="javascript:void(0);"><cite>用户首次登录修改密码</cite></a>
-                </span>
-            </div>
-            <div class="layui-card-body" style="padding: 15px;">
-                <div class="layui-form-item">
-                    <div>
-                        <input type="radio" name="firstLoginChangePassword" value="close" title="关闭" checked>
-                    </div>
-                    <div>
-                        <input type="radio" name="firstLoginChangePassword" value="open" title="开通">
-                    </div>
-                </div>
-            </div>
-        </div>
         <div class="layui-card">
             <div class="layui-card-header">
                 <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java
index fa0c6b03..f6c5bb77 100644
--- a/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java
+++ b/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java
@@ -35,6 +35,7 @@ public class UserPO implements Serializable {
     private String userLatitude;
     private Integer loginType;
     private String gmtPasswordModified;
+    private String gmtCreate;
 
     public String getUserId() {
         return userId == null ? "" : userId;
@@ -172,6 +173,14 @@ public class UserPO implements Serializable {
         this.gmtPasswordModified = gmtPasswordModified;
     }
 
+    public String getGmtCreate() {
+        return gmtCreate == null ? "" : gmtCreate;
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("{");
@@ -209,6 +218,8 @@ public class UserPO implements Serializable {
                 .append(loginType);
         sb.append(",\"gmtPasswordModified\":\"")
                 .append(gmtPasswordModified).append('\"');
+        sb.append(",\"gmtCreate\":\"")
+                .append(gmtCreate).append('\"');
         sb.append('}');
         return sb.toString();
     }
diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
index 9521b6f6..dd266de5 100644
--- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
+++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
@@ -382,8 +382,11 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
         if (config.get(FIRST_LOGIN_CHANGE_PASSWORD) != null && !StringUtils.isBlank(config.get(FIRST_LOGIN_CHANGE_PASSWORD).toString())) {
             firstLoginChangePassword = config.get(FIRST_LOGIN_CHANGE_PASSWORD).toString();
         }
-        String gmtPasswordModified = userDao.getGmtPasswordModified(securityComponent.getCurrentUser().getUserId());
-        if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) && StringUtils.isBlank(gmtPasswordModified)) {
+        UserPO userPO = getPO(securityComponent.getCurrentUser().getUserId());
+        String gmtCreate = userPO.getGmtCreate();
+        String gmtPasswordModified = userPO.getGmtPasswordModified();
+        if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) &&
+                (StringUtils.isBlank(gmtPasswordModified) || StringUtils.equals(gmtCreate.substring(0, 10), gmtPasswordModified.substring(0, 10)))) {
             return new SuccessResultData<>(PASSWORD_CHANGE);
         }
         DateTime gmtPasswordModifiedDateTime = null;
diff --git a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml
index 152d7ed4..1d2661d0 100644
--- a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml
+++ b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml
@@ -22,6 +22,7 @@
         <result property="userLatitude" column="user_latitude"/>
         <result property="loginType" column="login_type"/>
         <result property="gmtPasswordModified" column="gmt_password_modified"/>
+        <result property="gmtCreate" column="gmt_create"/>
     </resultMap>
 
     <resultMap id="userDTO" type="ink.wgink.pojo.dtos.user.UserDTO">