空指针bug调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -2292,6 +2292,12 @@ public class MonitorService {
                     }
                 }
 
+                if (fdnf == null || fdyf == null || gfyf == null || gfnf == null){
+                    fdnf = BigDecimal.valueOf(100);
+                    fdyf = BigDecimal.valueOf(100);
+                    gfyf = BigDecimal.valueOf(100);
+                    gfnf = BigDecimal.valueOf(100);
+                }
 //                for ( ProEconPowerstationInfoDay5 fdsj : qwt2){
 //                    if (fdsj.getForeignKeyId().equals("SXJ_KGDL_FLFD_ZGS0")){
 //                        fd_r_sjdl1 = fdsj.getRfdldb();
@@ -2314,8 +2320,6 @@ public class MonitorService {
                     gf_y_sjdl1 = gfyf.add(gf_r_sjdl1);
                     gf_n_sjdl1 = gfnf.add(gf_r_sjdl1);
                 }
-
-
             }
 
             List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getList(String.valueOf(year));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -200,6 +200,11 @@ public class StationMonitorService {
             yfdl1 = dla.getYfdldb();
             nfdl1 = dla.getNfdldb();
         }
+
+        if (yfdl1==null || nfdl1==null){
+            yfdl1 = BigDecimal.valueOf(100);
+            nfdl1 = BigDecimal.valueOf(100);
+        }
         QueryWrapper<ProEconPowerstationInfoDay5> qw2 = new QueryWrapper<>();
 
         qw2.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, wpid);