优化命名

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleScopeDataAccessConfig.java

@@ -19,15 +19,13 @@ public class SimpleScopeDataAccessConfig extends AbstractDataAccessConfig implem
     public SimpleScopeDataAccessConfig() {
     }
 
-    public SimpleScopeDataAccessConfig(String scopeType, String type) {
+    public SimpleScopeDataAccessConfig(String scopeType) {
         this.scopeType = scopeType;
-        this.type = type;
     }
 
-    public SimpleScopeDataAccessConfig(String scopeType, String type, Set<Object> scope) {
+    public SimpleScopeDataAccessConfig(String scopeType, Set<Object> scope) {
         this.scopeType = scopeType;
         this.scope = scope;
-        this.type = type;
     }
 
     @Override

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AbstractScopeDataAccessHandler.java

@@ -39,7 +39,7 @@ public abstract class AbstractScopeDataAccessHandler<E> implements DataAccessHan
 
     protected abstract String getOperationScope(E entity);
 
-    protected abstract Term applyQueryTerm(Set<String> scope);
+    protected abstract Term createQueryTerm(Set<String> scope);
 
     protected abstract Set<String> getTryOperationScope(String scopeType, PersonnelAuthorization authorization);
 
@@ -156,7 +156,7 @@ public abstract class AbstractScopeDataAccessHandler<E> implements DataAccessHan
             queryParamEntity.setTerms(new ArrayList<>());
             //添加一个查询条件
             queryParamEntity
-                    .addTerm(applyQueryTerm(scope))
+                    .addTerm(createQueryTerm(scope))
                     //客户端提交的参数 作为嵌套参数
                     .nest().setTerms(oldParam);
         } else {

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AreaScopeDataAccessHandler.java

@@ -23,7 +23,7 @@ public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<A
 
     @Override
     protected String getSupportScope() {
-        return DEPARTMENT_SCOPE;
+        return AREA_SCOPE;
     }
 
     @Override
@@ -44,7 +44,7 @@ public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<A
     }
 
     @Override
-    protected Term applyQueryTerm(Set<String> scope) {
+    protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
         term.setColumn(AreaAttachEntity.areaId);
         term.setTermType(TermType.in);

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java

@@ -46,7 +46,7 @@ public class DepartmentScopeDataAccessHandler extends AbstractScopeDataAccessHan
     }
 
     @Override
-    protected Term applyQueryTerm(Set<String> scope) {
+    protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
         term.setColumn(DepartmentAttachEntity.departmentId);
         term.setTermType(TermType.in);

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java

@@ -46,7 +46,7 @@ public class OrgScopeDataAccessHandler extends AbstractScopeDataAccessHandler<Or
     }
 
     @Override
-    protected Term applyQueryTerm(Set<String> scope) {
+    protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
         term.setColumn(OrgAttachEntity.orgId);
         term.setTermType(TermType.in);

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java

@@ -46,7 +46,7 @@ public class PersonScopeDataAccessHandler extends AbstractScopeDataAccessHandler
     }
 
     @Override
-    protected Term applyQueryTerm(Set<String> scope) {
+    protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
         term.setColumn(PersonAttachEntity.personId);
         term.setTermType(TermType.in);

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java

@@ -46,7 +46,7 @@ public class PositionScopeDataAccessHandler extends AbstractScopeDataAccessHandl
     }
 
     @Override
-    protected Term applyQueryTerm(Set<String> scope) {
+    protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
         term.setColumn(PositionAttachEntity.positionId);
         term.setTermType(TermType.in);