zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix null

Browse Source
This commit is contained in:
Looly
2020-12-22 17:04:56 +08:00
parent 9701a9619c
commit 9a181facc2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -3,7 +3,7 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.5.5 (2020-12-18) # 5.5.5 (2020-12-22)
### 新特性 ### 新特性
* 【core 】 URLUtil.normalize新增重载（pr#233@Gitee） * 【core 】 URLUtil.normalize新增重载（pr#233@Gitee）
@@ -14,6 +14,7 @@
### Bug修复 ### Bug修复
* 【core 】 FileUtil.isSub相对路径判断问题（pr#1315@Github） * 【core 】 FileUtil.isSub相对路径判断问题（pr#1315@Github）
* 【core 】 TreeUtil增加空判定（issue#I2ACCW@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.5.4 (2020-12-16) # 5.5.4 (2020-12-16)

2
hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java
View File

@@ -74,7 +74,7 @@ public class TreeUtil {
List<Tree<E>> finalTreeList = CollUtil.newArrayList(); List<Tree<E>> finalTreeList = CollUtil.newArrayList();
for (Tree<E> node : treeList) { for (Tree<E> node : treeList) {
if (parentId.equals(node.getParentId())) { if (ObjectUtil.equals(parentId,node.getParentId())) {
finalTreeList.add(node); finalTreeList.add(node);
innerBuild(treeList, node, 0, treeNodeConfig.getDeep()); innerBuild(treeList, node, 0, treeNodeConfig.getDeep());
} }