From bf10cc1b355acbf247fae16ee31abad7046298d6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 三月 2022 16:42:50 +0800
Subject: [PATCH] Merge pull request #399 from nikmu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java b/src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java
index 062d4cd..8df6f50 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java
@@ -25,7 +25,7 @@
if (node != null) {
node.getChildren().add(forestNode);
} else {
- forestNodeManager.addParentId(forestNode.getId());
+ forestNodeManager.addParentId(forestNode.getChannelId());
}
}
});
@@ -37,8 +37,8 @@
items.forEach(forestNode -> {
if (forestNode.getParentId() != null) {
INode<T> node = forestNodeManager.getTreeNodeAt(forestNode.getParentId());
- if (CollectionUtil.contains(parentIds, forestNode.getId())){
- forestNodeManager.addParentId(forestNode.getId());
+ if (CollectionUtil.contains(parentIds, forestNode.getChannelId())){
+ forestNodeManager.addParentId(forestNode.getChannelId());
} else {
if (node != null){
node.getChildren().add(forestNode);
--
Gitblit v1.8.0