From 342b6590ee28cc1a7b501287ce57eec1d6d166b8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index d565afa..27a9858 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -366,6 +366,9 @@
public void sendArdSyCarPosition() {
for(String key : ONLINE_USER_SESSIONS.keySet()){
SysUser sysUser = userMapper.selectUserById(key);
+ if(sysUser == null){
+ return;
+ }
String deptId = String.valueOf(sysUser.getDeptId());
Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
if(map != null){
@@ -558,6 +561,7 @@
}
}
+
public Map<String,List<String>> getInfo(String type,String stts){
if(stts.isEmpty()){
return new HashMap<>();
--
Gitblit v1.9.3