From ee0b68dbb6762583939b82bfbefb07a2af73172f Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Sun, 11 Aug 2024 16:14:13 +0800
Subject: [PATCH] =?UTF-8?q?TreeUtil=E5=A2=9E=E5=8A=A0build=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=9E=84=E5=BB=BABean?=
 =?UTF-8?q?=E7=9A=84=E6=A0=91=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                        |  4 +++-
 .../java/cn/hutool/core/lang/tree/TreeUtil.java     | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8e214241..7b799da02 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,11 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.31(2024-08-09)
+# 5.8.31(2024-08-11)
 
 ### 🐣新特性
+* 【core   】      TreeUtil增加build方法，可以构建Bean的树结构（pr#3692@Github）
+
 ### 🐞Bug修复
 * 【extra  】      修复JakartaMailUtil引用javax的问题
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java
index e44bc3c9e..69ad8233a 100755
--- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java
@@ -291,9 +291,12 @@ public class TreeUtil {
 	 * @param <E>			节点类型
 	 * @return List
 	 */
-	public static <T, E> List<E> build(List<E> nodes, T rootId, Function<E, T> idFunc, Function<E, T> parentIdFunc, BiConsumer<E, List<E>> setChildFunc) {
+	public static <T, E> List<E> build(List<E> nodes, T rootId,
+									   Function<E, T> idFunc,
+									   Function<E, T> parentIdFunc,
+									   BiConsumer<E, List<E>> setChildFunc) {
 		List<E> rootList = nodes.stream().filter(tree -> parentIdFunc.apply(tree).equals(rootId)).collect(Collectors.toList());
-		Map<T, T> filterOperated = new HashMap<>(rootList.size() + nodes.size());
+		Set<T> filterOperated = new HashSet<>(rootList.size() + nodes.size());
 		//对每个根节点都封装它的孩子节点
 		rootList.forEach(root -> setChildren(root, nodes, filterOperated, idFunc, parentIdFunc, setChildFunc));
 		return rootList;
@@ -311,15 +314,15 @@ public class TreeUtil {
 	 * @param <T>				节点ID类型
 	 * @param <E>				节点类型
 	 */
-	private static <T, E> void setChildren(E root, List<E> nodes, Map<T, T> filterOperated, Function<E, T> idFunc, Function<E, T> parentIdFunc, BiConsumer<E, List<E>> setChildFunc) {
+	private static <T, E> void setChildren(E root, List<E> nodes, Set<T> filterOperated, Function<E, T> idFunc, Function<E, T> parentIdFunc, BiConsumer<E, List<E>> setChildFunc) {
 		List<E> children = new ArrayList<>();
 		nodes.stream()
 			//过滤出未操作过的节点
-			.filter(body -> !filterOperated.containsKey(idFunc.apply(body)))
+			.filter(body -> !filterOperated.contains(idFunc.apply(body)))
 			//过滤出孩子节点
 			.filter(body -> Objects.equals(idFunc.apply(root), parentIdFunc.apply(body)))
 			.forEach(body -> {
-				filterOperated.put(idFunc.apply(body), idFunc.apply(root));
+				filterOperated.add(idFunc.apply(body));
 				children.add(body);
 				//递归 对每个孩子节点执行同样操作
 				setChildren(body, nodes, filterOperated, idFunc, parentIdFunc, setChildFunc);