Accept Merge Request #4: (develop-wxl -> master)

Merge Request: 增加判空逻辑，防止报错

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/jingandashujupingtai/d/bigdata_houtai/git/merge/4?initial=true

bigData/src/com/happy/action/TourAction.java

@@ -389,7 +389,11 @@ public class TourAction extends ActionSupport implements ServletRequestAware {
             }
             if ("中华传统文化园".equals(travelT.getPlace())){
                TravelT travel=touristAnalysisService.getTravelRecordByDateStr(TimeExchange.getDate(),travelT.getPlace());
-                travelT.setInCount(travel.getInCount());
+               if(travel==null||travel.getInCount()==null){
+                   //新接口没数据则用旧的
+                   continue;
+               }
+               travelT.setInCount(travel.getInCount());
             }
         }
         resultJson.put("code", 200);