双率修改

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -815,7 +815,16 @@ public class EconomicService {
 
             double qv = value.stream().mapToDouble(MaxVo::getAves).average().orElse(0);
 
-            double hv = hwtls.get(qkey).stream().mapToDouble(Glqx::getSjgl).average().orElse(0);
+//            if(!hwtls.isEmpty()){
+//            double hv = hwtls.get(qkey).stream().mapToDouble(Glqx::getSjgl).average().orElse(0);
+            if (!hwtls.isEmpty()) {
+                if(hwtls.get(qkey)==null) continue;
+                double hv = hwtls.get(qkey)
+                        .stream()
+                        .filter(glqx -> glqx.getSjgl() != null)
+                        .mapToDouble(Glqx::getSjgl)
+                        .average()
+                        .orElse(0);
 
             Tmelinessvo vo = new Tmelinessvo();
             for (ProBasicOrganizeEquipment wt : collect) {
@@ -827,6 +836,7 @@ public class EconomicService {
                     vo.setJsl(StringUtils.round((qv / hv) * 100,2));
                     vos.add(vo);
                 }
+             }
             }
         }