gsdb\zqdb

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

@@ -719,6 +719,7 @@ public class BenchmarkingService {
                 .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
+        list = list.stream().filter(a -> a.getSquareId() != null).collect(Collectors.toList());
         list.stream().forEach(i -> {
             WxsslVo vo = new WxsslVo();
 
@@ -740,8 +741,8 @@ public class BenchmarkingService {
                 vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_SQUARE)) {
                 vo.setId(i.getSquareId());
-                vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getWindturbineId()).getAname());
-                vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getWindturbineId()).getOrderNum().doubleValue());
+                vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getAname());
+                vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_COMPANY)) {
                 vo.setId(i.getId());
                 vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());