From 3a74f7d68e6c6ae97b2963a5ffc04790bfa913a4 Mon Sep 17 00:00:00 2001 From: baymax <862592396@qq.com> Date: Sun, 8 Jan 2023 15:43:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7id=E6=96=B9=E6=B3=95=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8CUserType=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=80=BC=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/enums/UserType.java | 4 ++++ .../src/main/java/com/ruoyi/common/helper/LoginHelper.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java index ec6510d98..055750aa9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java @@ -34,4 +34,8 @@ public enum UserType { } throw new RuntimeException("'UserType' not found By " + str); } + + public static String[] getUserTypeValue() { + return new String[]{SYS_USER.getUserType(), APP_USER.getUserType()}; + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java index 1cef0278b..5959a86ea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java @@ -82,7 +82,7 @@ public class LoginHelper { if (ObjectUtil.isNull(loginUser)) { String loginId = StpUtil.getLoginIdAsString(); String[] strs = StringUtils.split(loginId, JOIN_CODE); - if (!ArrayUtil.containsAny(strs, UserType.values())) { + if (!ArrayUtil.containsAny(strs, UserType.getUserTypeValue())) { throw new UtilException("登录用户: LoginId异常 => " + loginId); } // 用户id在总是在最后