From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +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