diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
index 35cf59d..0444009 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
@@ -286,11 +286,14 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
         List<DataField> list = dataFieldService.list(dbQw);
         TimeUnit.MILLISECONDS.sleep(1);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         //表内数据总量
         Integer count = customMapper.countBySQL(api, "where new_id is null and CreatedDate >= '" + beginDateStr + "' and CreatedDate < '" + endDateStr + "'");
         log.error("总Insert数据 count:{}；-开始时间:{}；-结束时间:{}；-api:{}；", count, beginDateStr, endDateStr, api);
@@ -692,11 +695,14 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
         List<DataField> list = dataFieldService.list(dbQw);
         TimeUnit.MILLISECONDS.sleep(1);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         // 表内数据总量
         Integer count = customMapper.countBySQL(api, "where new_id is not null and CreatedDate >= '" + beginDateStr + "' and CreatedDate < '" + endDateStr + "'");
         log.error("总Update数据 count:{}；-开始时间:{}；-结束时间:{}；-api:{}；", count, beginDateStr, endDateStr, api);
@@ -1047,10 +1053,14 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
         List<DataField> list = dataFieldService.list(dbQw);
         TimeUnit.MILLISECONDS.sleep(1);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
 
         //表内数据总量
         Integer count = customMapper.countBySQL(api, "where new_id is null and CreatedDate >= '" + beginDateStr + "' and CreatedDate < '" + endDateStr + "'");
diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
index d5c6317..0fb1f06 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
@@ -193,11 +193,14 @@ public class DataImportNewServiceImpl implements DataImportNewService {
         QueryWrapper<DataField> dbQw = new QueryWrapper<>();
         dbQw.eq("api", api);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
 
         DescribeSObjectResult dsr = partnerConnection.describeSObject(api);
         Field[] dsrFields = dsr.getFields();
@@ -708,13 +711,17 @@ public class DataImportNewServiceImpl implements DataImportNewService {
         dbQw.eq("api", api);
         List<DataField> list = dataFieldService.list(dbQw);
 
-        Date beginDate = param.getBeginCreateDate();
-        Date endDate = param.getEndCreateDate();
         String sql = "";
         String sql2 = "";
 
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        String beginDateStr = null;
+        String endDateStr = null;
+        Date beginDate = param.getBeginCreateDate();
+        Date endDate = param.getEndCreateDate();
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
 
         if (1 == param.getType()) {
             if (api.contains("Share")){
@@ -1132,11 +1139,14 @@ public class DataImportNewServiceImpl implements DataImportNewService {
             extraSql += " AND IsDeleted = false ";
         }
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         String token = Connection.getSessionHeader().getSessionId();
 
         String name = "Name";
@@ -1369,10 +1379,14 @@ public class DataImportNewServiceImpl implements DataImportNewService {
             extraSql += " AND IsDeleted = false ";
         }
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
 
         String token = connection.getSessionHeader().getSessionId();
 
@@ -1502,11 +1516,14 @@ public class DataImportNewServiceImpl implements DataImportNewService {
             extraSql += " AND IsDeleted = false ";
         }
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         String token = connection.getSessionHeader().getSessionId();
 
         String name = "Name";
diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java
index 68763c6..90b4bb0 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java
@@ -262,10 +262,14 @@ public class DataImportServiceImpl implements DataImportService {
         List<DataField> list = dataFieldService.list(dbQw);
         TimeUnit.MILLISECONDS.sleep(1);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         //表内数据总量
         Integer count = customMapper.countBySQL(api, "where new_id is null and CreatedDate >= '" + beginDateStr + "' and CreatedDate < '" + endDateStr + "'");
         log.error("总Insert数据 count:{}；-开始时间:{}；-结束时间:{}；-api:{}；", count, beginDateStr, endDateStr, api);
@@ -620,11 +624,14 @@ public class DataImportServiceImpl implements DataImportService {
         List<DataField> list = dataFieldService.list(dbQw);
         TimeUnit.MILLISECONDS.sleep(1);
 
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
-
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
         //表内数据总量
         Integer count = customMapper.countBySQL(api, "where new_id is not null and CreatedDate >= '" + beginDateStr + "' and CreatedDate < '" + endDateStr + "'");
 
@@ -773,9 +780,15 @@ public class DataImportServiceImpl implements DataImportService {
         QueryWrapper<DataField> dbQw = new QueryWrapper<>();
         dbQw.eq("api", api);
         List<DataField> list = dataFieldService.list(dbQw);
-
+        String beginDateStr = null;
+        String endDateStr = null;
         Date beginDate = param.getBeginCreateDate();
         Date endDate = param.getEndCreateDate();
+        if (param.getBeginCreateDate() != null && param.getEndCreateDate() != null){
+            beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
+            endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
+        }
+
         String sql = "";
         String sql2 = "";
         if (2 == param.getType()){
@@ -784,8 +797,6 @@ public class DataImportServiceImpl implements DataImportService {
                 return;
             }
         }
-        String beginDateStr = DateUtil.format(beginDate, "yyyy-MM-dd HH:mm:ss");
-        String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss");
 
         if (2 == param.getType()) {
             sql = "where new_id is not null and LastModifiedDate >= '" + beginDateStr + "' ";