From ca87662fba60d8c861b97c70dcb74a11b8956d60 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 13 八月 2024 19:26:26 +0800
Subject: [PATCH] bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 5900b2c..0921267 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,7 +72,7 @@
return false;
// System.out.println(tfid);
// System.out.println("00000000000---------------");
- ZInfoUser infu = this.getById(getInfoById(tfid));
+ ZInfoUser infu = this.getById(tfid);
if(infu==null)
return false;
if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
@@ -80,6 +80,14 @@
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
@@ -92,6 +100,7 @@
else
return null;
}
+
@Override
public List<ZInfoUser> getDataBySex(Integer sex){
@@ -132,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;
}
@@ -476,7 +486,7 @@
if (zInfoUser.getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUser.getSpouseId());
-
+
Genealogy spouseInfo = new Genealogy();
BeanUtils.copyProperties(spouse,spouseInfo);
newGenealogy.setSpouse(spouseInfo);
--
Gitblit v1.9.1