From 0dda333b07f5464577276ff8762ee780b19b1ac6 Mon Sep 17 00:00:00 2001
From: VampireAchao <achao1441470436@gmail.com>
Date: Mon, 19 Sep 2022 11:53:58 +0800
Subject: [PATCH] =?UTF-8?q?:trollface:=20=E9=80=92=E5=BD=92=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=81=8D=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/hutool/core/stream/CollectorUtil.java  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
index 35d3ecc8c..e2b3e1f9d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.stream;
 
 import cn.hutool.core.lang.Opt;
-import cn.hutool.core.lang.mutable.MutableObj;
 import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 
@@ -481,18 +480,14 @@ public class CollectorUtil {
 			final BiConsumer<T, List<T>> childrenSetter,
 			final boolean isParallel) {
 		return pIdValuesMap -> {
-			final MutableObj<Consumer<List<T>>> recursiveRef = new MutableObj<>();
-			final Consumer<List<T>> recursive = parents -> EasyStream.of(parents, isParallel).forEach(parent -> {
-				final List<T> children = pIdValuesMap.get(idGetter.apply(parent));
-				childrenSetter.accept(parent, children);
-				recursiveRef.get().accept(children);
-			});
-			final List<T> parents = parentFactory.apply(pIdValuesMap);
-			if (false == parents.isEmpty()) {
-				recursiveRef.set(recursive);
-				recursiveRef.get().accept(parents);
-			}
-			return parents;
+			EasyStream.of(pIdValuesMap.values(), isParallel).flat(Function.identity())
+					.forEach(value -> {
+						final List<T> children = pIdValuesMap.get(idGetter.apply(value));
+						if (children != null) {
+							childrenSetter.accept(value, children);
+						}
+					});
+			return parentFactory.apply(pIdValuesMap);
 		};
 	}