修改行政区域命名

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

@@ -34,9 +34,9 @@ public interface PersonnelAuthorization extends Serializable {
     Personnel getPersonnel();
 
     /**
-     * @return 人员所在地区ID, 只返回根节点, 永远不会返回{@code null}
+     * @return 人员所在行政区域ID, 只返回根节点, 永远不会返回{@code null}
      */
-    Set<TreeNode<String>> getAreaIds();
+    Set<TreeNode<String>> getDistrictIds();
 
     /**
      * @return 人员所在机构ID, 只返回根节点, 永远不会返回{@code null}
@@ -56,8 +56,8 @@ public interface PersonnelAuthorization extends Serializable {
     /**
      * @return 根地区ID
      */
-    default Set<String> getRootAreaId() {
-        return getAreaIds().stream().map(TreeNode::getValue).collect(Collectors.toSet());
+    default Set<String> getRootDistrictId() {
+        return getDistrictIds().stream().map(TreeNode::getValue).collect(Collectors.toSet());
     }
 
     /**
@@ -84,8 +84,8 @@ public interface PersonnelAuthorization extends Serializable {
     /**
      * @return 所有地区ID
      */
-    default Set<String> getAllAreaId() {
-        return getAreaIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet());
+    default Set<String> getAllDistrictId() {
+        return getDistrictIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet());
     }
 
     /**

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

@@ -14,7 +14,7 @@ import java.util.Set;
  */
 public class SimplePersonnelAuthorization implements PersonnelAuthorization {
     private Personnel             personnel;
-    private Set<TreeNode<String>> areaIds;
+    private Set<TreeNode<String>> districtIds;
     private Set<TreeNode<String>> orgIds;
     private Set<TreeNode<String>> positionIds;
     private Set<TreeNode<String>> departmentIds;
@@ -29,13 +29,13 @@ public class SimplePersonnelAuthorization implements PersonnelAuthorization {
     }
 
     @Override
-    public Set<TreeNode<String>> getAreaIds() {
-        if (areaIds == null) areaIds = Collections.emptySet();
-        return areaIds;
+    public Set<TreeNode<String>> getDistrictIds() {
+        if (districtIds == null) districtIds = Collections.emptySet();
+        return districtIds;
     }
 
-    public void setAreaIds(Set<TreeNode<String>> areaIds) {
-        this.areaIds = areaIds;
+    public void setDistrictIds(Set<TreeNode<String>> districtIds) {
+        this.districtIds = districtIds;
     }
 
     @Override

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

@@ -2,7 +2,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import org.hswebframework.web.entity.organizational.authorization.AreaAttachEntity;
+import org.hswebframework.web.entity.organizational.authorization.DistrictAttachEntity;
 import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
 
 import java.util.Collections;
@@ -15,10 +15,10 @@ import static org.hswebframework.web.organizational.authorization.access.DataAcc
  *
  * @author zhouhao
  */
-public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<AreaAttachEntity> {
+public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<DistrictAttachEntity> {
     @Override
-    protected Class<AreaAttachEntity> getEntityClass() {
-        return AreaAttachEntity.class;
+    protected Class<DistrictAttachEntity> getEntityClass() {
+        return DistrictAttachEntity.class;
     }
 
     @Override
@@ -27,22 +27,22 @@ public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<A
     }
 
     @Override
-    protected String getOperationScope(AreaAttachEntity entity) {
-        return entity.getAreaId();
+    protected String getOperationScope(DistrictAttachEntity entity) {
+        return entity.getDistrictId();
     }
 
     @Override
-    protected void applyScopeProperty(AreaAttachEntity entity, String value) {
-        entity.setAreaId(value);
+    protected void applyScopeProperty(DistrictAttachEntity entity, String value) {
+        entity.setDistrictId(value);
     }
 
     @Override
     protected Set<String> getTryOperationScope(String scopeType, PersonnelAuthorization authorization) {
         switch (scopeType) {
             case SCOPE_TYPE_CHILDREN:
-                return authorization.getAllAreaId();
+                return authorization.getAllDistrictId();
             case SCOPE_TYPE_ONLY_SELF:
-                return authorization.getRootAreaId();
+                return authorization.getRootDistrictId();
             default:
                 return Collections.emptySet();
         }
@@ -51,7 +51,7 @@ public class AreaScopeDataAccessHandler extends AbstractScopeDataAccessHandler<A
     @Override
     protected Term createQueryTerm(Set<String> scope) {
         Term term = new Term();
-        term.setColumn(AreaAttachEntity.areaId);
+        term.setColumn(DistrictAttachEntity.districtId);
         term.setTermType(TermType.in);
         term.setValue(scope);
         term.setType(Term.Type.and);