From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java
index e5bacd3..8e97d05 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java
@@ -3,7 +3,7 @@
import cn.dev33.satoken.stp.StpInterface;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserType;
-import com.ruoyi.common.utils.LoginUtils;
+import com.ruoyi.common.helper.LoginHelper;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -14,9 +14,9 @@
@Override
public List<String> getPermissionList(Object loginId, String loginType) {
- UserType userType = LoginUtils.getUserType(loginId);
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ UserType userType = UserType.getUserType(loginUser.getUserType());
if (userType == UserType.SYS_USER) {
- LoginUser loginUser = LoginUtils.getLoginUser();
return new ArrayList<>(loginUser.getMenuPermission());
} else if (userType == UserType.APP_USER) {
// app绔潈闄愯繑鍥� 鑷鏍规嵁涓氬姟缂栧啓
@@ -26,9 +26,9 @@
@Override
public List<String> getRoleList(Object loginId, String loginType) {
- UserType userType = LoginUtils.getUserType(loginId);
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ UserType userType = UserType.getUserType(loginUser.getUserType());
if (userType == UserType.SYS_USER) {
- LoginUser loginUser = LoginUtils.getLoginUser();
return new ArrayList<>(loginUser.getRolePermission());
} else if (userType == UserType.APP_USER) {
// app绔潈闄愯繑鍥� 鑷鏍规嵁涓氬姟缂栧啓
--
Gitblit v1.9.3