From 0275498af38bc1c8fbc5bfea54f3cce3550fd6ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 11 二月 2025 09:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
index e3f0a35..2cde5b4 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
@@ -187,9 +187,6 @@
public void checkPermiOr(String... permissions)
{
Set<String> permissionList = getPermiList();
- if(null == permissionList){
- return;
- }
for (String permission : permissions)
{
if (hasPermi(permissionList, permission))
@@ -356,9 +353,8 @@
try
{
LoginUser loginUser = getLoginUser();
- String userType = loginUser.getUserType();
- if(null != userType && "applet".equals(userType)){
- return null;
+ if(null == loginUser.getPermissions()){
+ return new HashSet<>();
}
return loginUser.getPermissions();
}
--
Gitblit v1.7.1