opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !273 from Baymax/dev

Browse Source
This commit is contained in:
Baymax 2023-01-08 07:57:48 +00:00 committed by Gitee
commit 8f13c038b1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java
View File

@ -34,4 +34,8 @@ public enum UserType {
} }
throw new RuntimeException("'UserType' not found By " + str); throw new RuntimeException("'UserType' not found By " + str);
} }
public static String[] getUserTypeValue() {
return new String[]{SYS_USER.getUserType(), APP_USER.getUserType()};
}
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
View File

@ -82,7 +82,7 @@ public class LoginHelper {
if (ObjectUtil.isNull(loginUser)) { if (ObjectUtil.isNull(loginUser)) {
String loginId = StpUtil.getLoginIdAsString(); String loginId = StpUtil.getLoginIdAsString();
String[] strs = StringUtils.split(loginId, JOIN_CODE); String[] strs = StringUtils.split(loginId, JOIN_CODE);
if (!ArrayUtil.containsAny(strs, UserType.values())) { if (!ArrayUtil.containsAny(strs, UserType.getUserTypeValue())) {
throw new UtilException("登录用户: LoginId异常 => " + loginId); throw new UtilException("登录用户: LoginId异常 => " + loginId);
} }
// 用户id在总是在最后 // 用户id在总是在最后