From 5a0f89efcca725abd41381fd74358e47b4ff3909 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 03 十月 2024 14:38:32 +0800
Subject: [PATCH] 修改用户信息时父母会消失&新增查找别的家族成员接口

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 9a29aca..5546b45 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
@@ -221,7 +221,7 @@
 //                infoUser.setFamilyId(mother.getFamilyId());
 //            }
         if (user.getSpouseId() != null){
-            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
+//            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
 
                 //鏄湰瀹�
                 if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
@@ -229,7 +229,7 @@
                     System.out.println("33333333333333333333333333333333333333333/");
                     infoUser.setFamilyId(spouse.getFamilyId());
                     infoUser.setClanId(spouse.getClanId());
-                }
+//                }
             }}
         if(infoUser.getFamilyId()!=null)
             zInfoUserService.saveOrUpdate(infoUser);
@@ -242,6 +242,11 @@
             ZInfoUser zu = new ZInfoUser();
             zu.setUserId(user.getSpouseId());
             zu.setSpouseId(infoUser.getUserId());
+            Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
+            Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
+            zu.setMomId(spouseMoM);
+            zu.setFatherId(spouseDad);
+
             zInfoUserService.updateById(zu);
         }
 
@@ -379,6 +384,10 @@
                 ZInfoUser zu = new ZInfoUser();
                 zu.setUserId(userAll.getSpouseId());
                 zu.setSpouseId(infoUser.getUserId());
+                Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId();
+                Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId();
+                zu.setMomId(spouseMoM);
+                zu.setFatherId(spouseDad);
                 zInfoUserService.updateById(zu);
             }
         }

--
Gitblit v1.9.1