From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +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