From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 2720897..a37f029 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -647,24 +647,4 @@
return userMapper.selectList(queryWrapper);
}
- @Override
- public List<SysUser> getAPPSoilderByCommanderId(String userId) {
- SysUser sysUser = userMapper.selectUserById(userId);//鑾峰彇绯荤粺鐢ㄦ埛
- List<Long> deptIdList = new ArrayList();
- deptIdList.add(sysUser.getDeptId());
- deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//閫掑綊鏌ヨ涓嬪睘閮ㄩ棬涓婚敭
- List<SysUser> result = userMapper.getOwnAndChildrenSoilderList(deptIdList);
- return result;
- }
-
- public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
- deptIdListr.addAll(deptIdList);
- List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
- if(result.size() != 0){
- deptIdListr.addAll(result);
- result = getOwnAndChildrenDeptIdList(result,deptIdListr);
- }
- deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
- return deptIdListr;
- }
}
--
Gitblit v1.9.3