From 9f5813763a54f7fde8b472b0da305d635a624e8f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 08 八月 2026 17:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
index fb45b80..d40d372 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public SysUserOnline loginUserToUserOnline(LoginUser user)
{
- if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser()))
+ if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
{
return null;
}
--
Gitblit v1.9.3