Merge remote-tracking branch 'origin/master'

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

@@ -405,7 +405,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         if (con != null && !"null".equals(con)){
             mapValue.put("con","%" +con+ "%");
         }
-        PageHelper.startPage(pageNum, pageSize);
+        if(pageNum!=null&&!("".equals(pageNum))&&pageSize!=null&&!("".equals(pageSize))){
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getSteelTruckDetailsOrder(mapValue);
         //查询多条数据
         for (Map<String, Object> objectMap : columnList) {