修改根据业务查询部门逻辑

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

@@ -48,23 +48,24 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
         SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             //排除掉已经存在的ids
-            list = list.stream().map(item -> {
+            Iterator<SiteBusinessEntity> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                SiteBusinessEntity item = iterator.next();
                 siteBusinessQuery.siteId(item.getSiteId());
                 siteBusinessQuery.setParentId(item.getBusinessId());
                 siteBusinessQuery.setIdNotList(params.getIdNotList());
-                List<SiteBusinessEntity> childs = this.find(siteBusinessQuery.siteId(item.getSiteId()).parentId(item.getBusinessId()));
+                List<SiteBusinessEntity> childs = this.find(siteBusinessQuery);
                 if (ObjectUtils.isEmpty(childs)) {
                     //子节点已经全部选中，删除父节点
-                    return null;
+                    iterator.remove();
                 } else {
                     childs.stream().forEach(item1 -> {
                         buildChildBusiness(item1);
                     });
                     item.setChildren(childs);
                     buildChildBusiness(item);
-                    return item;
                 }
-            }).filter(f -> f != null).collect(Collectors.toList());
+            }
         } else {
             list.stream().peek(item -> {
                 List<SiteBusinessEntity> childs = this.find(siteBusinessQuery.siteId(item.getSiteId()).parentId(item.getBusinessId()));
@@ -74,10 +75,10 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
                 item.setChildren(childs);
                 buildChildBusiness(item);
             }).count();
+            super.findAfter(params, pageInfo, context, list);
         }
 
 
-        super.findAfter(params, pageInfo, context, list);
     }
 
     private void buildChildBusiness(SiteBusinessEntity item) {

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

@@ -4,10 +4,10 @@ POST {{baseUrl}}/site/business/list
 Content-Type: application/json
 
 {
-  "idNotList": [11,12],
+  "idNotList": [11,12,17,18,19,20,21],
    "siteId": 1,
     "page":1,
-    "size":-1
+    "size":5
 }
 
 ###站点业务列表