Merge remote-tracking branch 'origin/master'

Administrator

2023-07-28 c45ce58884c59ddf8a6051ba370215e6f62adeb8

 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);
    }
    /**
     * 获取所有app用户
     */
    @ApiOperation("获取所有app用户")
    @GetMapping("/getAppUserlist")
    public AjaxResult getAppUserlist(Long deptId)
    {
        SysUser user=new SysUser();
        user.setDeptId(deptId);
        List<SysUser> list = sysUserService.selectAppUserList(user);
        return AjaxResult.success(list);
    }


    /**
     * 获取所有app用户
@@ -161,12 +150,11 @@
    {
        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)
        {

            ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
            if(ardAppPosition!=null) {
                Map<String, Object> params =new HashMap<>();