Commit c2d2ff59 authored by xixinzhao's avatar xixinzhao

区域树修改

parent 0d156bd6
...@@ -308,10 +308,10 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA ...@@ -308,10 +308,10 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
private List<UnitAreaTreeVo> getAreaChildren(UnitAreaTreeVo root, List<UnitAreaTreeVo> all) { private List<UnitAreaTreeVo> getAreaChildren(UnitAreaTreeVo root, List<UnitAreaTreeVo> all) {
return all.stream().filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId()) return all.stream().filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
|| (StringUtil.isNotEmpty(d.getBizOrgCode()) // || (StringUtil.isNotEmpty(d.getBizOrgCode())
&& d.getBizOrgCode().equals(root.getBizOrgCode()) // && d.getBizOrgCode().equals(root.getBizOrgCode())
&& !"area".equals(root.getType()) // && !"area".equals(root.getType())
&& !d.getId().equals(root.getId())) // && !d.getId().equals(root.getId()))
) )
.peek(m -> m.setChildren(getAreaChildren(m, all))) .peek(m -> m.setChildren(getAreaChildren(m, all)))
.collect(Collectors.toList()); .collect(Collectors.toList());
......
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