From fa5596bb2091089fb69a99f38d794a490734180e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 22 八月 2020 13:18:41 +0800
Subject: [PATCH] Editor组件优化,支持自定义高度&图片冲突问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
index 2747f6a..347837b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/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.2