From c8a96c5e4ce5d5013a5ec508e2422f40ecdc311e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 七月 2024 19:10:59 +0800
Subject: [PATCH] 家族
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 50fef41..e8857d0 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
@@ -160,6 +160,7 @@
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
+ infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
if(user.getSpouseId()!=null) {
@@ -171,24 +172,29 @@
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
- if (user.getFid() != null){
- ZInfoUser father = zInfoUserService.getById(user.getFid());
- if (father.getIsMyFamily() == 1)
- System.out.println("11111111111111111111111111111111/");
- infoUser.setFamilyId(father.getFamilyId());
+
+ if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ if (user.getFid() != null){
+ ZInfoUser father = zInfoUserService.getById(user.getFid());
+ if (father.getIsMyFamily() == 1)
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(father.getFamilyId());
+ }
}
- else if(user.getMid() != null){
- ZInfoUser mother = zInfoUserService.getById(user.getMid());
- if (mother.getIsMyFamily() == 1)
- System.out.println("2222222222222222222222222222222222/");
- infoUser.setFamilyId(mother.getFamilyId());
- }
-// else if (user.getSpouseId()!=null) {
-// ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
-// System.out.println("33333333333333333333333333333333333333333/");
-// infoUser.setFamilyId(spouse.getFamilyId());
-// infoUser.setSpouseId(user.getSpouseId());
-// }
+// else if(user.getMid() != null){
+// ZInfoUser mother = zInfoUserService.getById(user.getMid());
+// if (mother.getIsMyFamily() == 1)
+// System.out.println("2222222222222222222222222222222222/");
+// infoUser.setFamilyId(mother.getFamilyId());
+// }
+ if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
+ if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
+ ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
+ System.out.println("33333333333333333333333333333333333333333/");
+ infoUser.setFamilyId(spouse.getFamilyId());
+ infoUser.setSpouseId(user.getSpouseId());
+ }
+ }
zInfoUserService.saveOrUpdate(infoUser);
if(user.getSpouseId()!=null) {
@@ -280,13 +286,13 @@
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
if (father.getIsMyFamily() == 1)
infoUser.setFamilyId(father.getFamilyId());
- if (mother.getIsMyFamily() == 1)
+ else if (mother.getIsMyFamily() == 1)
infoUser.setFamilyId(mother.getFamilyId());
}
-// else {
-// ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
-// infoUser.setFamilyId(spouse.getFamilyId());
-// }
+ else {
+ ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
+ infoUser.setFamilyId(spouse.getFamilyId());
+ }
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
// if(user.getRoleIds()[0]==102)
--
Gitblit v1.9.1