From 8160f909be64d949f7e0198c6d8942365fd1d2e4 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Fri, 27 Dec 2024 11:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=98=AF=E5=90=A6=E4=B8=BA=E9=BB=98=E8=AE=A4=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/pojo/other/SingleUserResponse.java | 10 ++++++++--
 .../manage/service/serviceimpl/UserServiceImpl.java    |  8 ++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java
index 95af546..6ddf042 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java
@@ -1,6 +1,7 @@
 package com.electromagnetic.industry.software.manage.pojo.other;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;
@@ -54,7 +55,7 @@ public class SingleUserResponse {
     /**
      * 登录密码
      */
-    private String userPwd;
+    // private String userPwd;
 
     /**
      * 角色名称拼接字符串
@@ -93,10 +94,15 @@ public class SingleUserResponse {
      */
     private Integer isActivated;
 
+    /**
+     * 是否和默认密码相同
+     */
+    private Integer isDefaultPwd;
+
     /**
      * 盐
      */
-    private String salt;
+    // private String salt;
 
     /**
      * 创建人
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
index 138e5f8..cca9053 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
@@ -225,6 +225,14 @@ public class UserServiceImpl implements UserService {
             String roles = String.join(",", roleList);
             singleUserResponse.setRoles(roles);
             singleUserResponse.setRoleList(roleList);
+
+            // 检查密码是否和初始密码相同
+            if (user.getUserPwd().equals(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + user.getSalt()))) {
+                singleUserResponse.setIsDefaultPwd(1);
+            } else {
+                singleUserResponse.setIsDefaultPwd(0);
+            }
+
             list.add(singleUserResponse);
         }
         UserSearchResponse userSearchResponse = new UserSearchResponse();