更新根据站点查询站点树

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

@@ -532,7 +532,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         }
         siteAreaVo.setAreaCode(areaEntity.getAreaCode());
         siteAreaVo.setAreaName(AreaLevelEnum.getByValue(areaEntity.getAreaLevel()).getValue() == AreaLevelEnum.地市州.getValue() ? "市本级" : areaEntity.getName());
-        List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
+        SiteQuery siteQuery = new SiteQuery();
+        siteQuery.setAreaCode(areaEntity.getAreaCode());
+        if (!ObjectUtils.isEmpty(query.getSiteName())) {
+            siteQuery.setSiteName(query.getSiteName());
+        }
+        List<SiteEntity> siteEntityList = this.find(siteQuery);
         siteAreaVo.setSiteList(siteEntityList);
         list.add(siteAreaVo);
         //两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}
@@ -547,7 +552,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             //不足位数，补零  5115 020 120 01  市 区 街道 社区
             matchCode = AreaMatchCodeUtil.getMatchCode(matchCode, child.getAreaLevel());
 
-            SiteQuery siteQuery = new SiteQuery();
+            siteQuery = new SiteQuery();
             siteQuery.setAreaCode(matchCode + "%");
             if (!ObjectUtils.isEmpty(query.getSiteName())) {
                 siteQuery.setSiteName(query.getSiteName());

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

@@ -106,8 +106,18 @@ POST {{baseUrl}}/site/getAreaSitesBySite
 Content-Type: application/json
 
 {
-  "areaName":"宜宾市"
+  "areaName":"盐源县"
 }
+###站点列表
+POST {{baseUrl}}/site/getAreaSitesBySite
+Content-Type: application/json
+
+{
+  "areaName":"盐源县",
+  "siteName":"政33务"
+}
+
+
 
 
 ###同步事项数据

portal-manager/src/main/java/com/mortals/xhx/module/system/service/impl/SystemServiceApiServiceImpl.java

@@ -26,4 +26,9 @@ public class SystemServiceApiServiceImpl extends AbstractCRUDServiceImpl<SystemS
         pageInfo.setPrePageResult(-1);
         return entity;
     }
+
+
+    public static void main(String[] args) {
+        System.out.println(" 宜宾市政务服务和非公经济发展局".equals("宜宾市政务服务和非公经济发展局"));
+    }
 }
\ No newline at end of file