From 07df90f99b5592fffbb238f9d082a69adaf39127 Mon Sep 17 00:00:00 2001
From: JuJu <857815116@qq.com>
Date: Fri, 23 Oct 2020 15:33:06 +0800
Subject: [PATCH] 修正数组权限为空判断
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..e568b2b 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()))
{
--
Gitblit v1.9.3