From ae3897ba78d12226f9fc4515f542cb70a4207ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Sat, 10 Dec 2022 14:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/maku/framework/common/utils/TreeUtils.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java
index 09165fc..8ff938e 100644
--- a/maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java
+++ b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java
@@ -16,12 +16,12 @@ public class TreeUtils {
     /**
      * 根据pid，构建树节点
      */
-    public static <T extends TreeNode> List<T> build(List<T> treeNodes, Long pid) {
+    public static <T extends TreeNode<T>> List<T> build(List<T> treeNodes, Long pid) {
         // pid不能为空
         AssertUtils.isNull(pid, "pid");
 
         List<T> treeList = new ArrayList<>();
-        for(T treeNode : treeNodes) {
+        for (T treeNode : treeNodes) {
             if (pid.equals(treeNode.getPid())) {
                 treeList.add(findChildren(treeNodes, treeNode));
             }
@@ -33,9 +33,9 @@ public class TreeUtils {
     /**
      * 查找子节点
      */
-    private static <T extends TreeNode> T findChildren(List<T> treeNodes, T rootNode) {
-        for(T treeNode : treeNodes) {
-            if(rootNode.getId().equals(treeNode.getPid())) {
+    private static <T extends TreeNode<T>> T findChildren(List<T> treeNodes, T rootNode) {
+        for (T treeNode : treeNodes) {
+            if (rootNode.getId().equals(treeNode.getPid())) {
                 rootNode.getChildren().add(findChildren(treeNodes, treeNode));
             }
         }
@@ -45,18 +45,18 @@ public class TreeUtils {
     /**
      * 构建树节点
      */
-    public static <T extends TreeNode> List<T> build(List<T> treeNodes) {
+    public static <T extends TreeNode<T>> List<T> build(List<T> treeNodes) {
         List<T> result = new ArrayList<>();
 
         // list转map
         Map<Long, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
-        for(T treeNode : treeNodes){
+        for (T treeNode : treeNodes) {
             nodeMap.put(treeNode.getId(), treeNode);
         }
 
-        for(T node : nodeMap.values()) {
+        for (T node : nodeMap.values()) {
             T parent = nodeMap.get(node.getPid());
-            if(parent != null && !(node.getId().equals(parent.getId()))){
+            if (parent != null && !(node.getId().equals(parent.getId()))) {
                 parent.getChildren().add(node);
                 continue;
             }