From e0bf75fedccd21ae9f91e9a5e6a4934dc8a269dd Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 15 七月 2024 12:43:18 +0800
Subject: [PATCH] 分页查看分享&下载

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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..2d491c2 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
@@ -183,12 +183,12 @@
                 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.getSpouseId()!=null) {
+            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 +280,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