From 94b1a3bde93ad87f9347d8a08d70dd4f2318f1ce Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 17:47:51 +0800
Subject: [PATCH] 修改分享bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 4dbf8f9..fe666be 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
@@ -65,6 +65,24 @@
}
@Override
+ public Boolean findByuid(Long uid, Long tfid) {
+
+
+ if(uid==null)
+ return false;
+ // System.out.println(tfid);
+ // System.out.println("00000000000---------------");
+ ZInfoUser infu = this.getById(tfid);
+ if(infu==null)
+ return false;
+ if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
+ return true;
+ if(infu.getMomId()!=null && uid.equals(infu.getMomId()))
+ return true;
+ return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
+ }
+
+ @Override
public ZInfoUser getInfoBysysId(Long sysid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSysId, sysid);
@@ -73,6 +91,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
@@ -362,7 +389,8 @@
return people;
}).collect(Collectors.toList());
-//System.out.println("--------------++++++++++++++++--------------");
+System.out.println("--------------++++++++++++++++--------------");
+System.out.println(result);
return AjaxResult.success(result);
}
@@ -634,13 +662,13 @@
String roleName = zfRoleService.getById(user.getRoleId()).getName();
user.setRoleName(roleName);
- System.out.println("dddddddddddddddddddd");
- System.out.println(familyId);
- if(familyId!=null||familyId!=-1)
- {
- String familyName = zfFamilyService.getById(familyId).getName();
- user.setFamilyName(familyName);
- }
+// System.out.println("dddddddddddddddddddd");
+// System.out.println(familyId);
+// if(familyId!=null&&familyId!=-1)
+// {
+// String familyName = zfFamilyService.getById(familyId).getName();
+// user.setFamilyName(familyName);
+// }
}
return user;
}
@@ -781,10 +809,13 @@
// ).collect(Collectors.toList());
List<ZInfoUser> collect = allPeopleList.stream().filter(
- one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1)
+
+ one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1))
).map(
one -> {
- if (depth == 1) {
+ System.out.println("++++++++++----0009999");
+ System.out.println(one);
+ if (depth == 0) {
one.setIdentity(people.getIdentity() + 1);
//鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥�
Long spouseId = one.getSpouseId();
--
Gitblit v1.9.1