区域全部场站

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -70,13 +70,23 @@ public class BenchmarkingService {
 
         List<ProBasicOrganizeTree> list = CacheContext.wpls;
 
-        if (StringUtils.isNotEmpty(type) && !type.equals("0")) {
-            String finalType = type.equals("-1") ? "_FDC" : "_GDC";
-            list = list.stream().filter(wp -> wp.getId().indexOf(finalType) >= 0).collect(Collectors.toList());
+        //if (StringUtils.isNotEmpty(type) && !type.equals("0")) {
+        //    String finalType = type.equals("-1") ? "_FDC" : "_GDC";
+        //    list = list.stream().filter(wp -> wp.getId().indexOf(finalType) >= 0).collect(Collectors.toList());
+        //}
+
+        if("-1".equals(type)){
+            type = "F";
+        }else {
+            type = "G";
         }
 
+        String finalType = type;
+        list = list.stream().filter(wp -> finalType.equals(wp.getEleType())).collect(Collectors.toList());
+
         if (companyids.endsWith("RGN")) {
-            list = list.stream().filter(wp -> companyids.contains(wp.getParentCode())).collect(Collectors.toList());
+            //list = list.stream().filter(wp -> companyids.contains(wp.getParentCode())).collect(Collectors.toList());
+            list = CacheContext.proBasicOrganizeTrees.stream().filter(pbot->"STA".equals(pbot.getOrgType())&&finalType.equals(pbot.getEleType())).collect(Collectors.toList());
         }
         if (companyids.endsWith("FGS")) {
             list = list.stream().filter(wp -> companyids.contains(wp.getParentCode())).collect(Collectors.toList());