From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
index 7387b27..7397986 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
@@ -91,11 +91,11 @@
});
}
- // 6. 寰幆妫�娴�
- if (sorted.size() != nodes.size()) {
- handleSortingFailure(nodes, sorted, nodeMap);
- return Collections.emptyList();
- }
+// // 6. 寰幆妫�娴�
+// if (sorted.size() != nodes.size()) {
+// handleSortingFailure(nodes, sorted, nodeMap);
+// return Collections.emptyList();
+// }
return sorted;
}
@@ -108,9 +108,10 @@
ProductMix newNode = new ProductMix(
node.getId(),
node.getParentId(),
- node.getName(),
- node.getCode(),
- node.getType()
+ node.getTreeName(),
+ node.getTreeCode(),
+ node.getType(),
+ node.getCreateTime()
);
treeMap.put(newNode.getId(), newNode);
});
--
Gitblit v1.9.3