From f0a74544e0ab2ee3d191a3d46bd82a0274d67b6d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 25 六月 2024 20:29:26 +0800
Subject: [PATCH] 配偶过滤掉子孙和同性

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 314d72a..5900b2c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -72,12 +72,12 @@
             return false;
      //   System.out.println(tfid);
      //   System.out.println("00000000000---------------");
-        ZInfoUser infu = this.getById(tfid);
+        ZInfoUser infu = this.getById(getInfoById(tfid));
         if(infu==null)
             return false;
-        if(infu.getFatherId()!=null && uid==infu.getFatherId())
+        if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
             return true;
-        if(infu.getMomId()!=null && uid==infu.getMomId())
+        if(infu.getMomId()!=null && uid.equals(infu.getMomId()))
             return true;
         return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
     }
@@ -91,6 +91,14 @@
             return list.get(0);
         else
             return null;
+    }
+
+    @Override
+    public List<ZInfoUser> getDataBySex(Integer sex){
+        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(ZInfoUser::getSex, sex);
+        List<ZInfoUser> list = list(lqw);
+        return list;
     }
 
     @Override
@@ -653,7 +661,7 @@
             String roleName = zfRoleService.getById(user.getRoleId()).getName();
 
             user.setRoleName(roleName);
-            System.out.println("dddddddddddddddddddd");
+//            System.out.println("dddddddddddddddddddd");
 //            System.out.println(familyId);
 //            if(familyId!=null&&familyId!=-1)
 //            {

--
Gitblit v1.9.1