|
|
@@ -170,7 +170,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- hangshelist.addAll(cacheList.stream().filter(o -> parentIds.contains(o.getId())).collect(Collectors.toList()));
|
|
|
+ hangshelist.addAll(cacheList.stream()
|
|
|
+ .filter(o -> parentIds.contains(o.getId()) && ObjectUtil.isNotEmpty(o.getPath()) && o.getPath().startsWith(sysOrg.getPath()))
|
|
|
+ .collect(Collectors.toList()));
|
|
|
|
|
|
return generateTree(hangshelist, sysOrg);
|
|
|
}
|