From df748856d7475dfabf684658cbdd1064366036c2 Mon Sep 17 00:00:00 2001
From: Zjp <1215582715@qq.com>
Date: Mon, 19 Sep 2022 09:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E9=A2=9D=E5=A4=96=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/stream/EasyStream.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
index bbda79b8c..f2af24e8b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
@@ -319,12 +319,12 @@ public class EasyStream<T> extends AbstractEnhancedWrappedStream<T, EasyStream<T
 		List<T> nodeList = toList();
 		// 根据 父id 分组，让key为null的组中全是根节点
 		final Function<T, R> pIdClassifier = node -> {
-			R parentId = pIdGetter.apply(node);
-			// 父id为null（另类的根节点），或者是根节点
-			if (parentId == null || parentPredicate.test(node)) {
+			// 该节点是根节点, 分到 父id 为null的组中
+			if (parentPredicate.test(node)) {
 				return null;
 			}
-			return parentId;
+			// 返回 父id
+			return pIdGetter.apply(node);
 		};
 		// 父id 关联的 子节点列表
 		final Map<R, List<T>> pId2ChildrenMap = of(nodeList).group(pIdClassifier);