From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
index 94e936d..6a3de03 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
@@ -139,18 +139,7 @@
List<SysUser> list = sysUserService.selectUserList(user);
return AjaxResult.success(list);
}
- /**
- * 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
- */
- @ApiOperation("鑾峰彇鎵�鏈塧pp鐢ㄦ埛")
- @GetMapping("/getAppUserlist")
- public AjaxResult getAppUserlist(Long deptId)
- {
- SysUser user=new SysUser();
- user.setDeptId(deptId);
- List<SysUser> list = sysUserService.selectAppUserList(user);
- return AjaxResult.success(list);
- }
+
/**
* 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
@@ -161,7 +150,7 @@
{
SysUser user=new SysUser();
user.setDeptId(deptId);
- List<SysUser> list = sysUserService.selectAppUserList(user);
+ List<SysUser> list = sysUserService.selectAllAppUserList(user);
List<SysUser> onLineList=new ArrayList<>();
List<SysUser> offLineList=new ArrayList<>();
for(SysUser sysUser:list)
--
Gitblit v1.9.3