添加站点业务中子业务列表

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

@@ -41,21 +41,28 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
         list.stream().peek(item -> {
             List<SiteBusinessEntity> childs = this.find(new SiteBusinessQuery().siteId(item.getSiteId()).parentId(item.getBusinessId()));
-            if(!ObjectUtils.isEmpty(item.getBusinessId())){
+            childs.stream().forEach(item1 -> {
+                buildChildBusiness(item1);
+            });
+            item.setChildren(childs);
+            buildChildBusiness(item);
+        }).count();
+        super.findAfter(params, pageInfo, context, list);
+    }
+
+    private void buildChildBusiness(SiteBusinessEntity item) {
+        if (!ObjectUtils.isEmpty(item.getBusinessId())) {
             BusinessEntity businessEntity = businessService.get(item.getBusinessId());
-                if(!ObjectUtils.isEmpty(businessEntity)){
-                    BeanUtils.copyProperties(businessEntity,item,"id");
+            if (!ObjectUtils.isEmpty(businessEntity)) {
+                BeanUtils.copyProperties(businessEntity, item, "id");
                 //判断业务是否含有子业务
-                    if(businessEntity.getIsBusiness()== IsBusinessEnum.一级业务.getValue()){
+                if (businessEntity.getIsBusiness() == IsBusinessEnum.一级业务.getValue()) {
                     //添加二级业务列表
                     List<BusinessEntity> businessEntities = businessService.find(new BusinessQuery().parentId(businessEntity.getId()));
                     businessEntity.setChildren(businessEntities);
                 }
             }
         }
-            item.setChildren(childs);
-        }).count();
-        super.findAfter(params, pageInfo, context, list);
     }
 
     @Override
@@ -120,11 +127,11 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     public Result<SiteBusinessEntity> flatList(SiteBusinessEntity query, PageInfo pageInfo, Context context) {
         Result<SiteBusinessEntity> result = this.dao.getList(query, pageInfo);
-        result.getList().stream().forEach(item->{
-            if(!ObjectUtils.isEmpty(item.getBusinessId())){
+        result.getList().stream().forEach(item -> {
+            if (!ObjectUtils.isEmpty(item.getBusinessId())) {
                 BusinessEntity businessEntity = businessService.get(item.getBusinessId());
-                if(!ObjectUtils.isEmpty(businessEntity)){
-                    BeanUtils.copyProperties(businessEntity,item,"id");
+                if (!ObjectUtils.isEmpty(businessEntity)) {
+                    BeanUtils.copyProperties(businessEntity, item, "id");
                 }
             }
         });