diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java index 3a6707b61..c79d50c6b 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java @@ -82,7 +82,7 @@ public class OwnCreatedDataAccessHandler implements DataAccessHandler { QueryService queryService = ((QueryController) controller).getService(); RecordCreationEntity oldData = queryService.selectByPk(id); - if (oldData != null &&context.getAuthentication().getUser().getId().equals(oldData.getCreatorId())) { + if (oldData != null && !context.getAuthentication().getUser().getId().equals(oldData.getCreatorId())) { return false; } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java index 24baa1408..775af3fd5 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java @@ -18,9 +18,9 @@ import org.springframework.context.annotation.Configuration; public class OrganizationalAuthorizationAutoConfiguration implements BeanPostProcessor { @Bean - @ConditionalOnMissingBean(AreaScopeDataAccessHandler.class) - public AreaScopeDataAccessHandler areaScopeDataAccessHandler() { - return new AreaScopeDataAccessHandler(); + @ConditionalOnMissingBean(DistrictScopeDataAccessHandler.class) + public DistrictScopeDataAccessHandler areaScopeDataAccessHandler() { + return new DistrictScopeDataAccessHandler(); } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/CustomScopeHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/CustomScopeHandler.java index 15be3c4f3..62683732e 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/CustomScopeHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/CustomScopeHandler.java @@ -2,17 +2,15 @@ package org.hswebframework.web.organizational.authorization.simple.handler; import org.hswebframework.web.authorization.access.DataAccessConfig; import org.hswebframework.web.authorization.access.DataAccessHandler; -import org.hswebframework.web.authorization.access.ScopeDataAccessConfig; +import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext; import org.hswebframework.web.organizational.authorization.access.DataAccessType; -import org.hswebframework.web.organizational.authorization.simple.CustomScope; import org.hswebframework.web.organizational.authorization.simple.SimpleCustomScopeDataAccessConfig; import org.hswebframework.web.organizational.authorization.simple.SimpleScopeDataAccessConfig; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import java.util.Set; /** * TODO 完成注释 @@ -22,7 +20,7 @@ import java.util.Set; public class CustomScopeHandler implements DataAccessHandler { private List handlers = Arrays.asList( - new AreaScopeDataAccessHandler(), + new DistrictScopeDataAccessHandler(), new DepartmentScopeDataAccessHandler(), new OrgScopeDataAccessHandler(), new PersonScopeDataAccessHandler(), @@ -35,7 +33,7 @@ public class CustomScopeHandler implements DataAccessHandler { } @Override - public boolean handle(DataAccessConfig access, MethodInterceptorParamContext context) { + public boolean handle(DataAccessConfig access, AuthorizingContext context) { return ((SimpleCustomScopeDataAccessConfig) access).getScope() .stream() .map(scope -> new SimpleScopeDataAccessConfig(scope.getType(), DataAccessType.SCOPE_TYPE_CUSTOM, access.getAction(), new HashSet<>(scope.getIds()))) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java index 3643a1574..efe9a01a0 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java @@ -16,7 +16,7 @@ import static org.hswebframework.web.organizational.authorization.access.DataAcc * * @author zhouhao */ -public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler { +public class DistrictScopeDataAccessHandler extends AbstractScopeDataAccessHandler { @Override protected Class getEntityClass() { return DistrictAttachEntity.class;