dyf
/
ruoyi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正数组权限为空判断

master
JuJu 2020-10-23 15:33:06 +08:00
parent 7bd762267b
commit 07df90f99b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
View File

@ -35,6 +35,9 @@ public class PreAuthorizeAspect
/** 管理员角色权限标识 */ /** 管理员角色权限标识 */
private static final String SUPER_ADMIN = "admin"; private static final String SUPER_ADMIN = "admin";
/** 数组为0时 */
private static final Integer ARRAY_EMPTY = 0;
@Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)") @Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)")
public Object around(ProceedingJoinPoint point) throws Throwable public Object around(ProceedingJoinPoint point) throws Throwable
{ {
@ -63,7 +66,7 @@ public class PreAuthorizeAspect
} }
throw new PreAuthorizeException(); throw new PreAuthorizeException();
} }
else if (!StringUtils.isEmpty(annotation.hasAnyPermi())) else if (ARRAY_EMPTY < annotation.hasAnyPermi().length)
{ {
if (hasAnyPermi(annotation.hasAnyPermi())) if (hasAnyPermi(annotation.hasAnyPermi()))
{ {
@ -87,7 +90,7 @@ public class PreAuthorizeAspect
} }
throw new PreAuthorizeException(); throw new PreAuthorizeException();
} }
else if (!StringUtils.isEmpty(annotation.hasAnyRoles())) else if (ARRAY_EMPTY < annotation.hasAnyRoles().length)
{ {
if (hasAnyRoles(annotation.hasAnyRoles())) if (hasAnyRoles(annotation.hasAnyRoles()))
{ {