From de1823591a01addd54cb1aab4d78397dcb020472 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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