wangb преди 2 години
родител
ревизия
a830dc7732
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/NewtreeService.java

+ 2 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/NewtreeService.java

@@ -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);
         });