From e25154a1579c7b48d4f84574fa59b43a58675676 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 06 五月 2023 09:15:27 +0800
Subject: [PATCH] 增加了一个depth来表示要显示第几代

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 ae53517..21fcf92 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
@@ -303,7 +303,8 @@
         try {
             result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
                     .map(people -> {
-                        people.setChildList(fillChildren(people, allPeopleList));
+                        if(depth>1)
+                            people.setChildList(fillChildren(people, allPeopleList, depth-1));
                         return people;
                     }).collect(Collectors.toList());
         } catch (NullPointerException e) {
@@ -365,19 +366,30 @@
      * @param allPeopleList
      * @return
      */
-    private List<ZInfoUser> fillChildren(ZInfoUser people, List<ZInfoUser> allPeopleList) {
+    private List<ZInfoUser> fillChildren(ZInfoUser people, List<ZInfoUser> allPeopleList, Integer depth) {
 
         // TODO: 2023-05-05 鎺у埗閫掑綊鐨勬鏁�
+       // if(depth==layer)
 
+       // layer = layer + 1;
+        System.out.println(depth);
         List<ZInfoUser> collect = allPeopleList.stream().filter(
                 one -> one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()
         ).map(
                 one -> {
-                    one.setChildList(fillChildren(one, allPeopleList));
-                    return one;
+                    if(depth==1)
+                        return one;
+                    else {
+                        List<ZInfoUser> zinfo = fillChildren(one, allPeopleList, depth - 1);
+                        one.setChildList(zinfo);
+                        System.out.println(one);
+                        return one;
+                    }
+
+                    //return one;
                 }
         ).collect(Collectors.toList());
-
+        System.out.println(collect);
         return collect;
 
     }

--
Gitblit v1.9.1