From 9a181facc296becafd39a942bc1ba378a19d2da9 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Tue, 22 Dec 2020 17:04:56 +0800
Subject: [PATCH] fix null

---
 CHANGELOG.md                                                   | 3 ++-
 .../src/main/java/cn/hutool/core/lang/tree/TreeUtil.java       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 775181bd4..1a42db8bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.5.5 (2020-12-18)
+# 5.5.5 (2020-12-22)
 
 ### 新特性
 * 【core   】     URLUtil.normalize新增重载（pr#233@Gitee）
@@ -14,6 +14,7 @@
 
 ### Bug修复
 * 【core   】     FileUtil.isSub相对路径判断问题（pr#1315@Github）
+* 【core   】     TreeUtil增加空判定（issue#I2ACCW@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.5.4 (2020-12-16)
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 8a4d9e0e4..1babcc1fb 100644
--- 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
@@ -74,7 +74,7 @@ public class TreeUtil {
 
 		List<Tree<E>> finalTreeList = CollUtil.newArrayList();
 		for (Tree<E> node : treeList) {
-			if (parentId.equals(node.getParentId())) {
+			if (ObjectUtil.equals(parentId,node.getParentId())) {
 				finalTreeList.add(node);
 				innerBuild(treeList, node, 0, treeNodeConfig.getDeep());
 			}