111

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDataController.java

@@ -65,7 +65,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         paramsDTO.setStartDate(sdf.format(new Date()));
         AdsGicLogHaobanStoreLoginDDTO today = maidianDataService.totalActivationData(paramsDTO);
-
+        if(today == null){
+        	today = new AdsGicLogHaobanStoreLoginDDTO();
+        }
         returnMap.put("loginClerkCnt", dto.getLoginClerkCnt()) ;
         returnMap.put("activeClerkCnt", dto.getActiveClerkCnt()) ;
         returnMap.put("loginClerkTimes", dto.getLoginClerkTimes()) ;