From e8158d16a13c2ea1f2d8566578137db4394ab610 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 18:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java b/server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java
index 365c4bc..4852691 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java
@@ -43,12 +43,12 @@
for (Company treeNode : nodeList){
// 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓烘牴鑺傜偣锛屾澶勬敞鎰忥細鑻arentId绫诲瀷鏄疭tring锛屽垯瑕侀噰鐢╡quals()鏂规硶鍒ゆ柇銆�
if(origin== DataSyncConfig.origin.hk){
- if (Objects.isNull(treeNode.getHkParentId())) {
+ if (StringUtils.isBlank(treeNode.getHkParentId())) {
// 鏄紝娣诲姞
rootNodeList.add(treeNode);
}
}else if(origin== DataSyncConfig.origin.erp){
- if (Objects.isNull(treeNode.getErpParentId())) {
+ if (StringUtils.isBlank(treeNode.getErpParentId())) {
// 鏄紝娣诲姞
rootNodeList.add(treeNode);
}
--
Gitblit v1.9.3