|
@@ -34,13 +34,14 @@ public class NewtreeService {
|
|
|
|
|
|
//区域-场站
|
|
|
rels.forEach(czls -> {
|
|
|
- List<Windpowerstation> collect = wpls.stream().filter(w -> null != w.getRegionid() && w.getRegionid().equals(czls.getId())).collect(Collectors.toList());
|
|
|
+ List<Windpowerstation> collect = wpls.stream().filter(w -> null != w.getCompanyid() && w.getCompanyid().equals(czls.getCompanyid()) && null != w.getRegionid() && w.getRegionid().equals(czls.getId())).collect(Collectors.toList());
|
|
|
if (null != czls.getChildren()) {
|
|
|
czls.getChildren().clear();
|
|
|
}
|
|
|
collect.stream().forEach(d -> {
|
|
|
d.getChildren().clear();
|
|
|
});
|
|
|
+
|
|
|
czls.getChildren().addAll(collect);
|
|
|
});
|
|
|
|