From 0dc7b41e2530e7ea13066d2f17dc8bb24e4bd2dd Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 14 八月 2023 22:52:35 +0800
Subject: [PATCH] 1564894
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 c7a1608..863c175 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
@@ -30,6 +30,7 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* <p>
@@ -295,6 +296,10 @@
// } catch (NullPointerException e) {
// throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
// }
+
+ List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter(people -> people.getUserId() != 1 && people.getIsMyFamily() == 1).collect(Collectors.toList());
+
+
result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0) && people.getIsMyFamily() == 1)
.map(people -> {
if (depth > 1) {
@@ -304,7 +309,7 @@
ZInfoUser spouse = zInfoUserService.getById(spouseId);
spouse.setIdentity(1);
people.setSpouse(spouse);
- people.setChildList(fillChildren(people, allPeopleList, depth - 1));
+ people.setChildList(fillChildren(people, myFamilyPeopleList, depth - 1));
}
return people;
}).collect(Collectors.toList());
@@ -657,6 +662,11 @@
// layer = layer + 1;
System.out.println(depth);
+
+// List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter(
+// one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1)
+// ).collect(Collectors.toList());
+
List<ZInfoUser> collect = allPeopleList.stream().filter(
one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1)
).map(
--
Gitblit v1.9.1