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 | 3 ++-
1 files changed, 2 insertions(+), 1 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 5ca80b1..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,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<>();
--
Gitblit v1.9.3