From a8b712bc5b0af9ee6da25e1518729b78aa778fed Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 02 六月 2026 12:07:45 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

---
 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