From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/system/vo/DepartmentTree.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/vo/DepartmentTree.java b/server/service/src/main/java/com/doumee/dao/system/vo/DepartmentTree.java
index e8446bc..35b759b 100644
--- a/server/service/src/main/java/com/doumee/dao/system/vo/DepartmentTree.java
+++ b/server/service/src/main/java/com/doumee/dao/system/vo/DepartmentTree.java
@@ -3,6 +3,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
@@ -95,6 +96,11 @@
}
// for寰幆缁撴潫锛屽嵆鑺傜偣涓嬫病鏈変换浣曡妭鐐癸紝鏍戝舰鏋勫缓缁撴潫锛岃缃爲缁撴灉
pNode.setChildList(childTree);
+ if(CollectionUtils.isNotEmpty(childTree)){
+ pNode.setHasChildren(false);
+ }else{
+ pNode.setHasChildren(true);
+ }
return pNode;
}
--
Gitblit v1.9.3