From b1e37badce27751f7751bc27d69b1a6f6f64ae56 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 27 八月 2024 21:46:13 +0800
Subject: [PATCH] 修改bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 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..0e3a51b 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;
}
@@ -342,9 +352,11 @@
* @return
*/
@Override
- public AjaxResult listWithTree(Integer depth) {
-
- List<ZInfoUser> allPeopleList = list();
+ public AjaxResult listWithTree(Integer depth, Integer clanId) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(clanId!=null, ZInfoUser::getClanId, clanId);
+ // List<ZfEvent> list = list(lqw);
+ List<ZInfoUser> allPeopleList = list(lqw);
List<ZInfoUser> result = null;
// try {
// result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
@@ -387,9 +399,9 @@
// System.out.println(people);
return people;
}).collect(Collectors.toList());
-
-System.out.println("--------------++++++++++++++++--------------");
-System.out.println(result);
+//
+//System.out.println("--------------++++++++++++++++--------------");
+//System.out.println(result);
return AjaxResult.success(result);
}
@@ -407,14 +419,17 @@
lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
-
+ lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
List<ZInfoUser> allPeopleList = list(lqw);
+ System.out.println(allPeopleList);
+ System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
+
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
try {
result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
.map(people -> {
- if (depth > 1) {
+ if (depth >= 1) {
people.setIdentity(1);
people.setChildList(fillChildren2(people, allPeopleList, depth - 1));
}
@@ -424,6 +439,7 @@
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
+ System.out.println(result);
// result.stream().map(
// data->{
@@ -466,9 +482,11 @@
*/
@Override
public AjaxResult listGenealogy(Genealogy genealogy, Integer pageNum, Integer pageSize) {
+ userList.clear();
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
-
+ // System.out.println(userList);
+ System.out.println("---------------");
List<Genealogy> allData = userList.stream().map(
zInfoUser -> {
Genealogy newGenealogy = new Genealogy();
@@ -484,10 +502,12 @@
spouseInfo.setSpouseName(zInfoUser.getNickName());
newGenealogy.setSpouseName(spouse.getNickName());
}
+ System.out.println(newGenealogy);
return newGenealogy;
}
).collect(Collectors.toList());
-
+ System.out.println(allData);
+ System.out.println("999999999988888888888++++++++++++++++++++++");
List<Genealogy> collect = allData.stream()
.distinct()
.filter((data)-> data.getIsMyFamily() == 1)
@@ -501,8 +521,10 @@
}
resultData.add(collect.get(i));
}
-
-
+ System.out.println(resultData);
+ System.out.println("999999999988888888888++++++++++++++++++++++");
+//
+//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
Iterator<Genealogy> it = resultData.iterator();
while(it.hasNext()){
@@ -551,8 +573,9 @@
}
}
- System.out.println(resultData);
+ System.out.println(resultData);
+ System.out.println("================++++++++++++++66666666666666666999999999");
// for (Genealogy data : resultData) {
@@ -707,7 +730,17 @@
public ZInfoUser getMyself() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return getById(userId);
+ // System.out.println(userId);
+ //System.out.println("-----------------++++++++9999++++++++++----------");
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId() != null, ZInfoUser::getSysId, zInfoUser.getSysId());
+ List<ZInfoUser> list = list(lqw);
+ if(!list.isEmpty())
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -759,13 +792,18 @@
}
@Override
- public AjaxResult listAllFamilyPeople() {
+ public AjaxResult listAllFamilyPeople(Integer clanId) {
// List<ZInfoUser> lis = list();
// for(ZInfoUser tm: lis)
// {
// System.out.println(tm.getRoleId());
// }
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> lis = list(zInfoUserLambdaQueryWrapper);
+ List<ZInfoUser> collect = lis.stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+
+
return AjaxResult.success(collect);
}
@@ -866,7 +904,7 @@
// layer = layer + 1;
System.out.println(depth);
List<ZInfoUser> collect = allPeopleList.stream().filter(
- one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId())
+ one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId())
).map(
one -> {
if (depth == 1)
@@ -882,14 +920,14 @@
}
List<ZInfoUser> zinfo = fillChildren2(one, allPeopleList, depth - 1);
one.setChildList(zinfo);
- System.out.println(one);
+ // System.out.println(one);
return one;
}
//return one;
}
).collect(Collectors.toList());
- System.out.println(collect);
+ // System.out.println(collect);
return collect;
}
--
Gitblit v1.9.1