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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 6db8841..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
@@ -334,9 +334,12 @@
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<SysDept> tree = TreeUtils.buildDeptTree(list);
- list = TreeUtils.getLeafDepts(tree);
+ list = TreeUtils.getLeafDepts(list);
}
return list;
}
--
Gitblit v1.9.3