From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 1718d66..60a6159 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -3,6 +3,10 @@
import java.util.*;
import java.util.stream.Collectors;
+import cn.hutool.core.lang.tree.TreeUtil;
+import com.ruoyi.common.core.domain.entity.SysUserDept;
+import com.ruoyi.common.utils.TreeUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -46,6 +50,17 @@
@Override
@DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept) {
+ return deptMapper.selectDeptList(dept);
+ }
+
+ /**
+ * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
+ *
+ * @param dept 閮ㄩ棬淇℃伅
+ * @return 閮ㄩ棬淇℃伅闆嗗悎
+ */
+ @Override
+ public List<SysDept> selectSysDeptList(SysDept dept) {
return deptMapper.selectDeptList(dept);
}
@@ -315,4 +330,17 @@
private boolean hasChild(List<SysDept> list, SysDept t) {
return getChildList(list, t).size() > 0;
}
+
+
+ public List<SysDept> selectLeafSysDeptListBySysUserDept(SysUserDept sysUserDept){
+ List<SysDept> list = deptMapper.selectSysDeptListBySysUserDept(sysUserDept);
+ // userId 涓虹┖ = 绠＄悊鍛樺彇鏈満鏋勫叏閲忕瀹�/鐥呭尯锛氳銆屽叏閮ㄣ�嶏紝涓嶈兘鍐嶆寜鍙跺瓙鑺傜偣杩囨护鎺夌埗绾ч儴闂�
+ if (sysUserDept != null && sysUserDept.getUserId() == null) {
+ return list == null ? new ArrayList<>() : list;
+ }
+ if(CollectionUtils.isNotEmpty(list)){
+ list = TreeUtils.getLeafDepts(list);
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3