From a426fedf467748cd98fcb3733272cc99d9a9c05d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 02 八月 2024 21:27:43 +0800
Subject: [PATCH] 修改bug

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 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..29ee9cd 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
@@ -75,11 +75,19 @@
         ZInfoUser infu = this.getById(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());
+    }
+
+    @Override
+    public List<ZInfoUser> selectByClanId(Integer clanId) {
+        ZInfoUser zInfoUser = new ZInfoUser();
+        zInfoUser.setClanId(clanId);
+        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+        return list(lqw);
     }
 
     @Override
@@ -91,6 +99,15 @@
             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
@@ -124,6 +141,7 @@
         lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
         lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
         lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+        lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
         return lqw;
 
     }
@@ -653,7 +671,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