添加区域树结构

base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java

@@ -38,8 +38,8 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
         if ("True".equalsIgnoreCase(data.getHaveSonArea())) {
             String childKey = super.getCacheName() + ":" + data.getIid();
             //cacheService.del(childKey);
-             this.find(new AreaQuery().pid(data.getIid())).stream().forEach(item->{
-                 cacheService.lpush(childKey, item);
+            this.find(new AreaQuery().pid(data.getIid())).stream().forEach(item -> {
+                cacheService.lpush(childKey, item);
             });
         }
     }
@@ -187,15 +187,12 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
             rootId = 0L;
         }
 
-        AreaEntity areaEntity=this.selectOne(new AreaQuery().pid(rootId.toString()));
+        AreaEntity areaEntity = this.selectOne(new AreaQuery().pid(rootId.toString()));
 
         AreaTreeSelect areaTreeSelect = new AreaTreeSelect(areaEntity);
-        List<AreaTreeSelect> list = this.cacheService.lrange(super.getCacheName() + ":" + areaTreeSelect.getId(), AreaEntity.class).stream().map(item -> new AreaTreeSelect(item)).collect(Collectors.toList());
 
-        list.stream().forEach(areaTreeSelect1 -> {
-            rebuildList(areaTreeSelect1);
-        });
-        areaTreeSelect.setChildren(list);
+        rebuildList(areaTreeSelect);
+
         List<AreaTreeSelect> areaTreeSelectList = new ArrayList<>();
         areaTreeSelectList.add(areaTreeSelect);
 
@@ -204,8 +201,11 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
 
     private void rebuildList(AreaTreeSelect areaTreeSelect) {
         List<AreaTreeSelect> list = this.cacheService.lrange(super.getCacheName() + ":" + areaTreeSelect.getId(), AreaEntity.class).stream().map(item -> new AreaTreeSelect(item)).collect(Collectors.toList());
-
+        list.stream().forEach(item -> {
+            rebuildList(item);
+        });
         areaTreeSelect.setChildren(list);
+
     }