添加应用复选字段

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -15,6 +15,9 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.common.utils.SyncDeptThread;
 import com.mortals.xhx.common.utils.SyncGovMatterDetailThread;
+import com.mortals.xhx.module.area.model.AreaEntity;
+import com.mortals.xhx.module.area.model.AreaQuery;
+import com.mortals.xhx.module.area.service.AreaService;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.model.model.ModelEntity;
@@ -63,6 +66,8 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     private SiteService siteService;
     @Autowired
     private SiteMatterService siteMatterService;
+    @Autowired
+    private AreaService areaService;
 
     public SiteController() {
         super.setFormClass(SiteForm.class);
@@ -153,6 +158,10 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
         try {
+            AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
+            if(!ObjectUtils.isEmpty(areaEntity)){
+                site.setAreaCode(areaEntity.getAreaCode());
+            }
             List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_DATA, siteEntityList);

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -74,13 +74,21 @@ GET {{baseUrl}}/site/getAllSiteTree
 Accept: application/json
 
 
-###站点列表
+###根据区域编码获取站点列表
 POST {{baseUrl}}/site/getFlatSitesByAreaCode
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "areaCode":"510105521000"
+  "areaCode":"510105521000",
+  "areaName":"宜宾市"
+}
+
+###根据区域等级获取站点列表
+POST {{baseUrl}}/site/getAreaSitesByAreaLevel
+Content-Type: application/json
+
+{
+  "areaLevel":2
 }
 
 ###站点列表