zhuhao 3 лет назад
Родитель
Сommit
111306fbb0

+ 4 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/statisticalAnalysis/impl/ProductLinePerformanceServiceImpl.java

@@ -63,9 +63,11 @@ public class ProductLinePerformanceServiceImpl extends SuperCacheServiceImpl<Pro
             int monthHour = calCalendar.getActualMaximum(Calendar.DATE) * 24;
             params.setMonthHour(monthHour);
         }else{
-            Date SearchDate = com.github.zuihou.common.util.DateUtil.stringToDate0(params.getStatisticalDate(),"yyyy-MM");
+            Date searchDate = com.github.zuihou.common.util.DateUtil.stringToDate0(params.getStatisticalDate(),"yyyy-MM");
             Calendar calCalendar = Calendar.getInstance();
-            calCalendar.setTime(SearchDate);
+            if(searchDate != null){
+                calCalendar.setTime(searchDate);
+            }
             int monthHour = calCalendar.getActualMaximum(Calendar.DATE) * 24;
             params.setMonthHour(monthHour);
         }