驾驶舱

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -2048,10 +2048,18 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         String monthPeriod = currentYearMonth.format(formatter);
         GxtOrderData result = gxtRepairOrderMapper.selectHomePageData(userId,monthPeriod);
         GxtOrderData gstj = gxtRepairOrderMapper.selectGSTJ(userId,monthPeriod);
-        result.setWbgs(gstj.getWbgs());
-        result.setWxgs(gstj.getWxgs());
-        BigDecimal wbgs = result.getWbgs();
-        BigDecimal wxgs = result.getWxgs();
+        BigDecimal wbgs = BigDecimal.ZERO;
+        BigDecimal wxgs = BigDecimal.ZERO;
+        if (gstj!=null) {
+            if (gstj.getWbgs()!=null) {
+                wbgs = gstj.getWbgs();
+            }
+            if (gstj.getWxgs()!=null) {
+                wxgs = gstj.getWxgs();
+            }
+        }
+        result.setWbgs(wbgs);
+        result.setWxgs(wxgs);
         BigDecimal score = result.getScore();
         BigDecimal scoreLast = result.getScoreLast();
         BigDecimal gfjsy = BigDecimal.ZERO;