From 4502f650f4816e55b5c7bf751ffce3aa0dce72dd Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 18:13:07 +0800
Subject: [PATCH] 找回密码功能

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 3694def..e2c875b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -197,7 +197,8 @@
         us.setRoleId(user.getRoleId());      // 瑙掕壊ID锛�102=瀹跺涵鎴愬憳锛�
         us.setSex(user.getSex());            // 鎬у埆锛�0鐢�/1濂筹級
         us.setStatus(user.getStatus());      // 璐︽埛鐘舵�侊紙鍚敤/绂佺敤锛�
-        us.setRemark(user.getRemark());      // 澶囨敞淇℃伅
+        us.setRemark(user.getRemark());
+        us.setEmail(user.getEmail());// 澶囨敞淇℃伅
         userService.updateUser(us);          // 鎵цSysUser琛ㄦ洿鏂�
 
         // ===== 2. 瀹跺涵鎴愬憳涓撳睘澶勭悊锛堜粎瑙掕壊ID=102鏃舵墽琛岋級=====
@@ -209,7 +210,8 @@
             infoUser.setNickName(user.getNickName());      // 褰撳墠鏄电О
             infoUser.setIsMyFamily(user.getIsMyFamily()); // 瀹跺涵鎴愬憳鏍囪锛�0/1锛�
             infoUser.setMomId(user.getMid());             // 姣嶄翰ID锛堝彲涓虹┖锛�
-            infoUser.setFatherId(user.getFid());           // 鐖朵翰ID锛堝彲涓虹┖锛�
+            infoUser.setFatherId(user.getFid());
+            infoUser.setEmail(user.getEmail());// 鐖朵翰ID锛堝彲涓虹┖锛�
             // 濠氬Щ鐘舵�佺┖鍊间繚鎶わ紙0鏈/1宸插/2绂诲锛�
             infoUser.setMaritalStatus(user.getMaritalStatus() == null ? null : user.getMaritalStatus());
             // 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
@@ -412,6 +414,7 @@
         user.setUpdateBy(userAll.getUpdateBy());    // 鏇存柊浜�
         user.setClanId(userAll.getClanId());        // 瀹舵棌ID
         user.setPaid(userAll.getPaid());
+        user.setEmail(userAll.getEmail());
 
         // ===================== 2. 鍞竴鎬ф牎楠岋紙鐧诲綍鍚�/鎵嬫満鍙�/閭锛� =====================
         // 2.1 鐧诲綍鍚嶆牎楠�
@@ -451,13 +454,15 @@
             infoUser.setNickName(userAll.getNickName()); // 褰撳墠鏄电О
             infoUser.setOldName(userAll.getUserName());  // 鍘嗗彶鍚嶇О锛堜繚鐣欒褰曪級
             infoUser.setPhoneNumber(userAll.getPhonenumber()); // 鑱旂郴鏂瑰紡
-
+            infoUser.setEmail(userAll.getEmail());
             String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
 
             String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
             infoUser.setUaid(uniqueId);
+
+            Boolean same = false;
             if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-                zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+                same = zInfoUserService.setUaidSame(user.getPhonenumber(), user.getUserName(), uniqueId);
             }
             // 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
             infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
@@ -533,6 +538,12 @@
                 infoUser.setRoleId(3L); // 璁剧疆瀹跺涵瑙掕壊ID
                 zInfoUserService.save(infoUser); // 淇濆瓨瀹跺涵鎵╁睍淇℃伅
 
+                if(same){
+                    zInfoUserService.setUserInfoSame(infoUser);
+                    marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());
+
+                }
+
                 // 5.5.1 鏇存柊閰嶅伓鍏宠仈淇℃伅
                 if (userAll.getSpouseId() != null) {
                     ZInfoUser zu = new ZInfoUser();

--
Gitblit v1.9.1