From eb69f8e614cf4f5740fe63b5536b7cd1bc0be28c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 18 Apr 2021 22:32:19 +0800
Subject: [PATCH] 过滤BindingResult对象，防止异常
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
index 64c9f17..3a44d82 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -35,6 +35,9 @@
/** 管理员角色权限标识 */
private static final String SUPER_ADMIN = "admin";
+ /** 数组为0时 */
+ private static final Integer ARRAY_EMPTY = 0;
+
@Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)")
public Object around(ProceedingJoinPoint point) throws Throwable
{
@@ -63,7 +66,7 @@
}
throw new PreAuthorizeException();
}
- else if (!StringUtils.isEmpty(annotation.hasAnyPermi()))
+ else if (ARRAY_EMPTY < annotation.hasAnyPermi().length)
{
if (hasAnyPermi(annotation.hasAnyPermi()))
{
@@ -87,7 +90,7 @@
}
throw new PreAuthorizeException();
}
- else if (!StringUtils.isEmpty(annotation.hasAnyRoles()))
+ else if (ARRAY_EMPTY < annotation.hasAnyRoles().length)
{
if (hasAnyRoles(annotation.hasAnyRoles()))
{
@@ -165,7 +168,7 @@
}
for (String roleKey : userInfo.getRoles())
{
- if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(role))
+ if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(role))
{
return true;
}
--
Gitblit v1.9.3