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 | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 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 f38039c..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
@@ -17,6 +17,11 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
+/**
+ * 自定义权限实现
+ *
+ * @author ruoyi
+ */
@Aspect
@Component
public class PreAuthorizeAspect
@@ -30,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
{
@@ -42,34 +50,56 @@
return point.proceed();
}
- if (StringUtils.isEmpty(annotation.hasPermi()) && hasPermi(annotation.hasPermi()))
+ if (!StringUtils.isEmpty(annotation.hasPermi()))
{
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.lacksPermi()) && hasPermi(annotation.lacksPermi()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasAnyPermi()) && hasAnyPermi(annotation.hasAnyPermi()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasRole()) && hasRole(annotation.hasRole()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.lacksRole()) && lacksRole(annotation.lacksRole()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasAnyRoles()) && hasAnyRoles(annotation.hasAnyRoles()))
- {
- return point.proceed();
- }
- else
- {
+ if (hasPermi(annotation.hasPermi()))
+ {
+ return point.proceed();
+ }
throw new PreAuthorizeException();
}
+ else if (!StringUtils.isEmpty(annotation.lacksPermi()))
+ {
+ if (lacksPermi(annotation.lacksPermi()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (ARRAY_EMPTY < annotation.hasAnyPermi().length)
+ {
+ if (hasAnyPermi(annotation.hasAnyPermi()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (!StringUtils.isEmpty(annotation.hasRole()))
+ {
+ if (hasRole(annotation.hasRole()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (!StringUtils.isEmpty(annotation.lacksRole()))
+ {
+ if (lacksRole(annotation.lacksRole()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (ARRAY_EMPTY < annotation.hasAnyRoles().length)
+ {
+ if (hasAnyRoles(annotation.hasAnyRoles()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+
+ return point.proceed();
}
/**
--
Gitblit v1.9.3