From 9944c43ec57c79d3eb72f09ac797e9d2b772dedd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 16:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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