From 9a4b09e6a32b4510e1e9c4fb13d6cb90b896abe4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 16 七月 2024 21:23:26 +0800
Subject: [PATCH] 修改分页查询

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   23 ++++++++++++-----------
 1 files changed, 12 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..570aa81 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) {
@@ -183,12 +184,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 +281,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