Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 dee2cf1591b135c9bf75dcaf81a96ee48435b5f9

 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java

@@ -159,19 +159,27 @@
            if(ardAppPosition!=null) {
                Map<String, Object> params =new HashMap<>();
                params.put("longitude", ardAppPosition.getLongitude());
                params.put("lagitude", ardAppPosition.getLatitude());
                params.put("latitude", ardAppPosition.getLatitude());
                params.put("altitude", ardAppPosition.getAltitude());
                params.put("bearing", ardAppPosition.getBearing());
                sysUser.setParams(params);
            }
            if(sysUser.getAppOnlineState().equals("1"))
            if(StringUtils.isNotNull(sysUser.getAppOnlineState()))
            {
                onLineList.add(sysUser);
                if(sysUser.getAppOnlineState().equals("1"))
                {
                    onLineList.add(sysUser);
                }
                else
                {
                    offLineList.add(sysUser);
                }
            }
            else
            {
                offLineList.add(sysUser);
            }

        }
        Map<String,Object> onlineMap=new HashMap<>();
        onlineMap.put("children",onLineList);