问题处理

hx-socket/src/main/java/com/fjhx/socket/core/WebSocketPush.java

@@ -135,6 +135,9 @@ public class WebSocketPush {
      */
     public static void pushMessageCount(Long userId) {
         List<WebSocketServer> webSocketServers = WebSocketServer.webSocketMap.get(userId);
+        if(ObjectUtil.isEmpty(webSocketServers)){
+            return;
+        }
         for (WebSocketServer webSocketServer : webSocketServers) {
             PushParam pushParam = new PushParam();
             pushParam.setUserId(webSocketServer.getUserId());

hx-socket/src/main/java/com/fjhx/socket/core/WebSocketServer.java

@@ -73,6 +73,8 @@ public class WebSocketServer {
     @OnOpen
     public void onOpen(@RequestBody Session session, @PathParam("token") String token) {
 
+        session.setMaxIdleTimeout(35 * 1000);
+
         DynamicDataSourceContextHolder.push(BaseSourceConstant.BASE);
 
         // 解析token

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select
 		u.user_id, u.dept_id, u.nick_name, u.nick_name_en, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
-		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,company_id
+		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -148,6 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="jobNumber != null and jobNumber != ''">
 			AND instr(u.job_number,#{jobNumber})
 		</if>
+		<if test="companyId != null">
+			AND u.company_id = #{companyId}
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>