From 997b03f08f01f87112227b617e446515b22c6c74 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 28 七月 2024 22:07:58 +0800
Subject: [PATCH] 家族

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   74 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 6 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 51db1d4..bfd8dbb 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
@@ -11,9 +11,11 @@
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.entity.sysUserInfo;
 import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
 import com.ruoyi.domain.ZfFamily;
 import com.ruoyi.domain.sysUserAndUserInfo;
 import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfAncestorService;
 import com.ruoyi.service.ZfFamilyService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +70,9 @@
     private ZInfoUserService zInfoUserService;
     @Resource
     private ZfFamilyService zfFamilyService;
+
+    @Resource
+    private ZfAncestorService zfAncestorService;
     /**
      * 鑾峰彇鐢ㄦ埛鍒楄〃
      */
@@ -148,26 +153,62 @@
         us.setRoleId(user.getRoleId());
         us.setSex(user.getSex());
         us.setStatus(user.getStatus());
+        us.setRemark(user.getRemark());
         userService.updateUser(us);
 
   //      System.out.println(user.getFamilyId());
      //   System.out.println("[[[[]]]]]]");
-                ZInfoUser infoUser = new ZInfoUser();
+        ZInfoUser infoUser = new ZInfoUser();
         infoUser.setUserId(user.getUserId());
         infoUser.setOldName(user.getUserName());
+        infoUser.setNickName(user.getNickName());
         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)
+        if(user.getSpouseId()!=null) {
             infoUser.setSpouseId(user.getSpouseId());
+        }
 //        ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
 //        if(zfFamily!=null&&zfFamily.getFid()!=null)
 //            infoUser.setFatherId(zfFamily.getFid());
 //        if(zfFamily!=null&&zfFamily.getMid()!=null)
 //            infoUser.setMomId(zfFamily.getMid());
+
+            if (user.getFid() != null){
+            if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+                    ZInfoUser father = zInfoUserService.getById(user.getFid());
+                        System.out.println("11111111111111111111111111111111/");
+                        infoUser.setFamilyId(father.getFamilyId());
+                        infoUser.setClanId(father.getClanId());
+
+            }}
+//            else if(user.getMid() != null){
+//                ZInfoUser mother = zInfoUserService.getById(user.getMid());
+//                if (mother.getIsMyFamily() == 1)
+//                    System.out.println("2222222222222222222222222222222222/");
+//                infoUser.setFamilyId(mother.getFamilyId());
+//            }
+        if (user.getSpouseId() != null){
+            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.setClanId(spouse.getClanId());
+                }
+            }}
+
         zInfoUserService.saveOrUpdate(infoUser);
+        if(user.getSpouseId()!=null) {
+            ZInfoUser zu = new ZInfoUser();
+            zu.setUserId(user.getSpouseId());
+            zu.setSpouseId(infoUser.getUserId());
+            zInfoUserService.updateById(zu);
+        }
+
       //  zInfoUserService.update(infoUser);
              //   .saveOrUpdate(infoUser);
         return AjaxResult.success();
@@ -193,6 +234,7 @@
         user.setSex(userAll.getSex());
         user.setRemark(userAll.getRemark());
         user.setUpdateBy(userAll.getUpdateBy());
+//        user.setSex(userAll.getSex()=="鐢�"?"1":"0");
     //    user.setPostIds(userAll.getPostIds());
       //  user.set
         if (!userService.checkUserNameUnique(user))
@@ -211,7 +253,8 @@
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         userService.insertUser(user);
         //鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
-//
+
+
 //        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
         ZInfoUser infoUser = new ZInfoUser();
         infoUser.setSysId(user.getUserId());
@@ -220,7 +263,7 @@
         infoUser.setOldName(userAll.getUserName());
         infoUser.setPhoneNumber(userAll.getPhonenumber());
         infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
-        infoUser.setFamilyId(userAll.getFid());
+//        infoUser.setFamilyId(userAll.getFid());
         infoUser.setSpouseId(userAll.getSpouseId());
 
         infoUser.setFatherId(userAll.getFid());
@@ -235,8 +278,8 @@
 //            infoUser.setFatherId(zfFamily.getMid());
 //            //   infoUser.setMomId(zfFamily.getMid());
 //        }
-        System.out.println("-----");
-        System.out.println(userAll.getIsMyFamily());
+//        System.out.println("-----");
+//        System.out.println(userAll.getIsMyFamily());
 
         infoUser.setIsMyFamily(userAll.getIsMyFamily());
 //        if(userAll.getSpouseId()==0)
@@ -245,6 +288,24 @@
 //            infoUser.setSpouseId(userAll.getSpouseId());
 //
 //        }
+        if (userAll.getFid() != null && userAll.getMid() != null){
+            ZInfoUser father = zInfoUserService.getById(userAll.getFid());
+            ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
+            if (father.getIsMyFamily() == 1){
+                infoUser.setFamilyId(father.getFamilyId());
+                infoUser.setClanId(father.getClanId());}
+            else if (mother.getIsMyFamily() == 1){
+                infoUser.setFamilyId(mother.getFamilyId());
+                infoUser.setClanId(mother.getClanId());
+
+        }
+        }
+        else {
+            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
+            infoUser.setFamilyId(spouse.getFamilyId());
+            infoUser.setClanId(spouse.getClanId());
+        }
+
         //鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
      //   if(user.getRoleIds()[0]==102)
 
@@ -262,6 +323,7 @@
                 zInfoUserService.updateById(zu);
             }
         }
+
         //    zInfoUserService.saveOrUpdate(infoUser);
 //            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
 //            lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());

--
Gitblit v1.9.1