From 228fd36b1d8b9f5364fbefe3c1baffc842f4efae Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 8 Mar 2023 09:19:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BC=9A=E6=8A=A5=E9=94=99=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=20#4708?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableTaskLogService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); From 857649bdb08f820d04f78e7be8581d77f9d8aa45 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 8 Mar 2023 10:27:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V52__1.18.5.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 backend/src/main/resources/db/migration/V52__1.18.5.sql 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';