From 3d5c7002efaf4d518991394c1a95c80ee798fd62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=99=E5=A4=8F=E5=A4=A9=E4=BE=9D=E7=84=B6=E5=B9=B3?=
 =?UTF-8?q?=E5=87=A1?= <1822213252@qq.com>
Date: Tue, 10 Oct 2023 03:53:33 +0000
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5null=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 这夏天依然平凡 <1822213252@qq.com>
---
 .../java/com/ruoyi/common/constant/UserConstants.java |  2 +-
 .../ruoyi/system/service/impl/SysRoleServiceImpl.java | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 61552f8fc..585a5351b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -10,7 +10,7 @@ public interface UserConstants {
     /**
      * 平台内系统用户的唯一标志
      */
-    String SYS_USER = "SYS_USER";
+    String SYS_USER = "sys_user";
 
     /**
      * 正常状态
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 4f05d5ee7..14b930753 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -454,10 +454,13 @@ public class SysRoleServiceImpl implements ISysRoleService {
                 return;
             }
             LoginUser loginUser = LoginHelper.getLoginUser(token);
-            if (ObjectUtil.isNotNull(loginUser) && loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) {
-                try {
-                    StpUtil.logoutByTokenValue(token);
-                } catch (NotLoginException ignored) {
+            if (ObjectUtil.isNotNull(loginUser)) {
+                if (loginUser.getUserType().equals(UserConstants.SYS_USER)
+                    && loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) {
+                    try {
+                        StpUtil.logoutByTokenValue(token);
+                    } catch (NotLoginException ignored) {
+                    }
                 }
             }
         });