Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager-ui/admin/package.json

@@ -8,6 +8,7 @@
     "build": "vue-cli-service build --mode production",
     "beta": "vue-cli-service build --mode beta",
     "test": "vue-cli-service build --mode test",
+    "yb": "vue-cli-service build --mode yb",
     "build:prod": "vue-cli-service build --model prod",
     "lint": "vue-cli-service lint",
     "predeploy": "yarn build",

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -322,13 +322,16 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public Rest< List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context) {
-        Map<String, Object> map = new HashMap<>();
-
        List<SiteAreaVo> list = new ArrayList<>();
-
         //获取当前节点的第一层子节点
-        SiteEntity siteCache = this.getCache(query.getId().toString());
-        AreaEntity areaEntity = areaService.getCache(siteCache.getAreaCode());
+        if(ObjectUtils.isEmpty(query.getAreaName())){
+           throw new AppException("区域名称查询参数不能为空！");
+        }
+        //SiteEntity siteCache = this.getCache(query.getId().toString());
+        AreaEntity areaEntity = areaService.getCache(query.getAreaName());
+        if(ObjectUtils.isEmpty(areaEntity)){
+            throw new AppException("区域名称不存在！");
+        }
         if ("False".equalsIgnoreCase(areaEntity.getHaveSonArea())) {
             throw new AppException("当前站点无子区域！");
         }

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

@@ -84,6 +84,14 @@ Content-Type: application/json
   "areaCode":"510105521000"
 }
 
+###站点列表
+POST {{baseUrl}}/site/getAreaSitesBySite
+Content-Type: application/json
+
+{
+  "id":7
+}
+
 
 ###同步事项数据
 POST {{baseUrl}}/site/syncGovMatterBySiteId