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

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

@@ -443,9 +443,9 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     @Override
     public Rest<List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context) {
         List<SiteAreaVo> list = new ArrayList<>();
-
         SiteAreaVo siteAreaVo = new SiteAreaVo();
 
+
         //获取当前节点的第一层子节点
         if (ObjectUtils.isEmpty(query.getAreaName())) {
             throw new AppException("区域名称查询参数不能为空！");

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

@@ -158,19 +158,31 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
         try {
             if (!ObjectUtils.isEmpty(site.getSiteName())) {
-                SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
-                if (!ObjectUtils.isEmpty(siteEntity)) {
-                    site.setAreaCode(siteEntity.getAreaCode());
+               // SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
+                List<SiteEntity> siteEntities = this.service.find(new SiteQuery().siteName(site.getSiteName()));
+
+                if (!ObjectUtils.isEmpty(siteEntities)) {
+                    site.setAreaCodeList(siteEntities.stream().map(i->i.getAreaCode()).collect(Collectors.toList()));
                 }
+
+        /*        if (!ObjectUtils.isEmpty(siteEntity)) {
+                    site.setAreaCode(siteEntity.getAreaCode());
+                }*/
             }
             if (!ObjectUtils.isEmpty(site.getAreaName())) {
-                AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
-                if (!ObjectUtils.isEmpty(areaEntity)) {
-                    site.setAreaCode(areaEntity.getAreaCode());
+                //AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
+                List<AreaEntity> areaEntities = areaService.find(new AreaQuery().name(site.getAreaName()));
+                if (!ObjectUtils.isEmpty(areaEntities)) {
+                   // site.setAreaCode(areaEntity.getAreaCode());
+                    site.setAreaCodeList(areaEntities.stream().map(i->i.getAreaCode()).collect(Collectors.toList()));
                 }
             }
 
-            List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
+
+            List<SiteEntity> siteEntityList =site.getAreaCodeList().stream().flatMap(areaCode->{
+               return this.service.getFlatSitesByAreaCode(areaCode, getContext()).stream();
+            }).distinct().collect(Collectors.toList());
+            //List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
 
             if (!ObjectUtils.isEmpty(site.getSiteName())) {
                 siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());