Commit 6277a333 authored by 赵啸非's avatar 赵啸非

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

parent a2b830a6
...@@ -53,17 +53,20 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu ...@@ -53,17 +53,20 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
SiteBusinessEntity item = iterator.next(); SiteBusinessEntity item = iterator.next();
siteBusinessQuery.siteId(item.getSiteId()); siteBusinessQuery.siteId(item.getSiteId());
siteBusinessQuery.setParentId(item.getBusinessId()); siteBusinessQuery.setParentId(item.getBusinessId());
siteBusinessQuery.setIdNotList(params.getIdNotList()); int count = this.count(siteBusinessQuery, context);
List<SiteBusinessEntity> childs = this.find(siteBusinessQuery); if (count > 0) {
if (ObjectUtils.isEmpty(childs)) { siteBusinessQuery.setIdNotList(params.getIdNotList());
//子节点已经全部选中,删除父节点 List<SiteBusinessEntity> childs = this.find(siteBusinessQuery);
iterator.remove(); if (ObjectUtils.isEmpty(childs)) {
} else { //子节点已经全部选中,删除父节点
childs.stream().forEach(item1 -> { iterator.remove();
buildChildBusiness(item1); } else {
}); childs.stream().forEach(item1 -> {
item.setChildren(childs); buildChildBusiness(item1);
buildChildBusiness(item); });
item.setChildren(childs);
buildChildBusiness(item);
}
} }
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment