From 617af7026d11ecaf00409dd500bb164978efabdc Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 29 Aug 2017 22:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java index e2c4ccd55..49f31afe4 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java @@ -16,6 +16,7 @@ import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; /** @@ -48,10 +49,13 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho if (!CollectionUtils.isEmpty(parserCustomers)) { definition = parserCustomers.stream() .map(customer -> customer.parse(paramContext)) + .filter(Objects::nonNull) .findAny().orElse(null); if (definition != null) { + if(definition instanceof EmptyAuthorizeDefinition)return null; return definition; } + } Authorize classAuth = AopUtils.findAnnotation(paramContext.getTarget().getClass(), Authorize.class);