From f97d74f9f851ef70048fab599d7bc54d7932afc7 Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期三, 23 八月 2023 17:29:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 04f65db..bd751a8 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 @@ -145,11 +145,11 @@ SysUser user = new SysUser(); user.setDeptId(deptId); - user.setAppUserType("1"); List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user); - //杩囨护鍦ㄧ嚎 + //杩囨护鍦ㄧ嚎鍜屽崟鍏电 List<SysUser> onLineList = appUserList.stream() .filter(sysUser -> (sysUser.getAppOnlineState().equals("1"))) + .filter(sysUser -> (sysUser.getAppUserType().equals("1"))) .collect(Collectors.toList()); //杩囨护鑼冨洿 for (SysUser sysUser : onLineList) { @@ -189,11 +189,11 @@ SysUser user = new SysUser(); user.setDeptId(deptId); - user.setAppUserType("1"); List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user); //杩囨护鍦ㄧ嚎 List<SysUser> onLineList = appUserList.stream() .filter(sysUser -> (sysUser.getAppOnlineState().equals("1"))) + .filter(sysUser -> (sysUser.getAppUserType().equals("1"))) .collect(Collectors.toList()); //杩囨护鑼冨洿 for (SysUser sysUser : onLineList) { -- Gitblit v1.9.3