From b5cf2539edf29b0da8bde02ad3b5c1c373824a34 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 15:23:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 6e4a04a..014701b 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
@@ -23,15 +23,12 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
-import com.ruoyi.utils.httpclient.SYCarClient;
-import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.ListObjectsArgs;
import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
-import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
@@ -371,11 +368,11 @@
SysUser sysUser = userMapper.selectUserById(key);
String deptId = String.valueOf(sysUser.getDeptId());
Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
- System.out.println("/////////////");
- System.out.println(PositionContainer.getDeptPositionMap());
- Map<Integer,Object> data = new HashMap();
- data.put(30000, map.values());
- WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ if(map != null){
+ Map<Integer,Object> data = new HashMap();
+ data.put(30000, map.values());
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ }
}
}
--
Gitblit v1.9.3