消缺及时率代码提交

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/threerate/ThreeRateService.java

@@ -106,10 +106,15 @@ public class ThreeRateService {
                 .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId,ProBasicOrganizeTree::getOrderNum));
 
         List<String> wpids = new ArrayList<>();
+        List<ProBasicOrganizeTree> wplist = null;
         //场站模糊查询
         if (StringUtils.isNotEmpty(companyId)) {
-            List<ProBasicOrganizeTree> wplist = CacheContext.wpls.stream().filter(wp -> wp.getParentCode().equals(companyId) || wp.getParentCode().equals(companyId)).collect(Collectors.toList());
-            wpids = wplist.stream().map(ProBasicOrganizeTree::getId).collect(Collectors.toList());
+            if (companyId.contains("JS_RGN")){
+                 wplist = CacheContext.wpls.stream().filter(wp -> wp.getId().endsWith("STA")).collect(Collectors.toList());
+            }else {
+                wplist = CacheContext.wpls.stream().filter(wp -> wp.getParentCode().equals(companyId) || wp.getParentCode().equals(companyId)).collect(Collectors.toList());
+            }
+             wpids = wplist.stream().map(ProBasicOrganizeTree::getId).collect(Collectors.toList());
 
         }
         if (StringUtils.isNotEmpty(windpowerstationId)) {