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'
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index 8cf5417..837d4fc 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -493,12 +493,12 @@
}
@Override
- public List<Map<String,Object>> getAPPSoilderByCommanderId(String userId) {
+ public List<Map<String,Object>> getOnlineAPPSoilderByCommanderId(String userId) {
SysUser sysUser = sysUserMapper.selectUserById(userId);//鑾峰彇绯荤粺鐢ㄦ埛
List<Long> deptIdList = new ArrayList();
deptIdList.add(sysUser.getDeptId());
deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//閫掑綊鏌ヨ涓嬪睘閮ㄩ棬涓婚敭
- List<SysUser> result = sysUserMapper.getOwnAndChildrenSoilderList(deptIdList);
+ List<SysUser> result = sysUserMapper.getOwnAndChildrenOnlineSoilderList(deptIdList);
List<Map<String,Object>> resultList = new ArrayList();
for(SysUser sysUserIn : result){
Map<String,Object> map = new HashMap();
--
Gitblit v1.9.3