Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/controller/TmstruckTimeTaskResultController.java

@@ -252,7 +252,7 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
             mapValue=new HashMap<>();
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
-        if (con!=null){
+        if (con!=null && !"null".equals(con) && !"".equals(con)){
             mapValue.put("con",con);
         }
         if (userId!=null&&!userId.equals("undifined")&&!userId.equals("")){