From 87bdb6240c2c4706f3fe408e0feefe68a4aa3af3 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 17 Jan 2019 11:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/handler/ScopeByUserHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java index c49aff5c9..58e59a0f7 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java @@ -256,12 +256,7 @@ public class ScopeByUserHandler implements DataAccessHandler { boolean children = config.isChildren(); Class controller = ClassUtils.getUserClass(context.getParamContext().getTarget().getClass()); Class entityClass = org.hswebframework.utils.ClassUtils.getGenericType(controller, 0); - if (RecordCreationEntity.class.isAssignableFrom(entityClass)) { - controllerCache.targetIdGetter = createGetter(RecordCreationEntity.class, RecordCreationEntity::getCreatorId); - controllerCache.queryConsumer = (query, scopeInfo) -> { - query.in(getControlProperty(entityClass, RecordCreationEntity::getCreatorIdProperty), scopeInfo.termType, scopeInfo.scope); - }; - } else if (OrgAttachEntity.class.isAssignableFrom(entityClass) && config.getScopeType().contains("ORG")) { + if (OrgAttachEntity.class.isAssignableFrom(entityClass) && config.getScopeType().contains("ORG")) { controllerCache.targetIdGetter = createGetter(OrgAttachEntity.class, OrgAttachEntity::getOrgId); controllerCache.queryConsumer = (query, scopeInfo) -> { query.and(getControlProperty(entityClass, OrgAttachEntity::getOrgIdProperty), children ? "org-child-in" : "in", scopeInfo.scope); @@ -281,6 +276,11 @@ public class ScopeByUserHandler implements DataAccessHandler { controllerCache.queryConsumer = (query, scopeInfo) -> { query.and(getControlProperty(entityClass, DistrictAttachEntity::getDistrictIdProperty), children ? "dist-child-in" : "in", scopeInfo.scope); }; + } else if (RecordCreationEntity.class.isAssignableFrom(entityClass)) { + controllerCache.targetIdGetter = createGetter(RecordCreationEntity.class, RecordCreationEntity::getCreatorId); + controllerCache.queryConsumer = (query, scopeInfo) -> { + query.and(getControlProperty(entityClass, RecordCreationEntity::getCreatorIdProperty), scopeInfo.termType, scopeInfo.scope); + }; } else { String userIdField = getUserField(entityClass); controllerCache.targetIdGetter = entity -> {