diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
index 387ef5d355..6b6fe46f60 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
@@ -80,7 +80,7 @@ public class DataSetTableTaskLogService {
                 row[0] = item.getName();
                 row[1] = item.getDatasetName();
                 row[2] = DateUtil.formatDateTime(new Date(item.getStartTime()));
-                row[3] = DateUtil.formatDateTime(new Date(item.getEndTime()));
+                row[3] = item.getEndTime() != null ? DateUtil.formatDateTime(new Date(item.getEndTime())) : "";
                 row[4] = Translator.get("I18N_TASK_LOG_" + item.getStatus().toUpperCase()) ;
                 return row;
             }).collect(Collectors.toList());
diff --git a/backend/src/main/resources/db/migration/V52__1.18.5.sql b/backend/src/main/resources/db/migration/V52__1.18.5.sql
new file mode 100644
index 0000000000..388bf70ea5
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V52__1.18.5.sql
@@ -0,0 +1,4 @@
+UPDATE `my_plugin`
+SET `version` = '1.18.5'
+where `plugin_id` > 0
+  and `version` = '1.18.4';