From c3a11538b96aeac198fbaa467210ef8754773ad1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 24 十月 2025 18:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
index 1b6d502..b744f1e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
@@ -36,6 +36,10 @@
@Override
public List<Integer> getAllSubDeptIds(String deptId) {
+ TDept tDept = this.baseMapper.selectById(deptId);
+ if (tDept.getDeptName().contains("董事长")||tDept.getDeptName().contains("总经理")){
+ return this.baseMapper.selectList(null).stream().map(TDept::getId).collect(Collectors.toList());
+ }
List<Integer> allSubIds = new ArrayList<>();
getSubDeptIdsRecursive(Integer.valueOf(deptId), allSubIds);
return allSubIds.stream().distinct().collect(Collectors.toList());
--
Gitblit v1.7.1