From dee2cf1591b135c9bf75dcaf81a96ee48435b5f9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
index 674d023..9025354 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -117,14 +117,13 @@
if(PositionContainer.getUserPositionMap().size() != 0){
for(String userId : PositionContainer.getUserPositionMap().keySet()){
Map<String,Map<String,Object>> carIdCarMap = PositionContainer.getUserPositionMap().get(userId);
- if(carIdCarMap.keySet().contains(carId)){
- PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ if(carIdCarMap != null){
+ if(carIdCarMap.keySet().contains(carId)){
+ PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ }
}
}
}
-
-
-
}
/**
*
--
Gitblit v1.9.3