添加分类查询返回组

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

@@ -390,7 +390,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     public List<SiteTreeSelect> getSiteTree(Context context) {
         // List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
         List<SiteTreeSelect> collect = getSiteTreeSelects(context.getUser().getId().toString());
-       // log.info("siteTree:{}", JSON.toJSONString(collect));
+        // log.info("siteTree:{}", JSON.toJSONString(collect));
         if (!ObjectUtils.isEmpty(collect)) {
             return collect;
         } else {
@@ -572,12 +572,20 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         List<SiteEntity> list = new ArrayList<>();
         for (AreaEntity areaEntity : areaEntities) {
             List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
-
             if (!ObjectUtils.isEmpty(siteEntityList)) {
                 list.addAll(siteEntityList);
             }
         }
 
+        list.stream().forEach(item -> {
+            AreaEntity areaEntity = areaService.getCache(item.getAreaCode());
+            if (!ObjectUtils.isEmpty(areaEntity)) {
+                item.setAreaLevel(areaEntity.getAreaLevel());
+            } else {
+                item.setAreaLevel(0);
+            }
+        });
+
         return Rest.ok(list);
     }
 
@@ -865,7 +873,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         String matchCode = "511530000000".replaceAll("(0)+$", "");
         System.out.println(matchCode);
 
-        matchCode=StrUtil.padAfter(matchCode,7,"0");
+        matchCode = StrUtil.padAfter(matchCode, 7, "0");
 
         System.out.println(matchCode);
 

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

@@ -132,7 +132,7 @@ Content-Type: application/json
 POST {{baseUrl}}/site/getFlatSitesGroupByAreaCode
 Content-Type: application/json
 
-{"areaName":"象鼻街道"}
+{}
 
 ###站点区域分组列表
 POST {{baseUrl}}/site/getSitesGroupByAreaLevel