Merge remote-tracking branch 'origin/master'

Administrator

2023-07-26 342b6590ee28cc1a7b501287ce57eec1d6d166b8

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -366,7 +366,7 @@
    public void sendArdSyCarPosition() {
        for(String key : ONLINE_USER_SESSIONS.keySet()){
            SysUser sysUser = userMapper.selectUserById(key);
            if(sysUser.getDeptId() == null){
            if(sysUser == null){
                return;
            }
            String deptId = String.valueOf(sysUser.getDeptId());
@@ -561,6 +561,7 @@
        }
    }


    public Map<String,List<String>> getInfo(String type,String stts){
        if(stts.isEmpty()){
            return new HashMap<>();