From 11525887a534e6c5a10d75836c7dafef44f40e6c Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 1 Apr 2024 13:53:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8E?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/datafill/DataFillService.java | 8 ++++++-- core/frontend/src/views/dataFilling/form/index.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java index 745c1eeb95..21564c0109 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java @@ -262,9 +262,13 @@ public class DataFillService { dataFillFormMapper.deleteByExample(example); } - DeLogUtils.save(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATA_FILL_FORM, dataFillForm.getId(), dataFillForm.getPid(), null, null); + if (dataFillForm != null) { - dataFillTaskService.deleteTaskByFormId(id); + DeLogUtils.save(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATA_FILL_FORM, dataFillForm.getId(), dataFillForm.getPid(), null, null); + + dataFillTaskService.deleteTaskByFormId(id); + + } } public List listFields(String id) throws Exception { diff --git a/core/frontend/src/views/dataFilling/form/index.vue b/core/frontend/src/views/dataFilling/form/index.vue index 5a51cc3296..45380067e9 100644 --- a/core/frontend/src/views/dataFilling/form/index.vue +++ b/core/frontend/src/views/dataFilling/form/index.vue @@ -127,7 +127,7 @@ export default { } ).then(() => { deleteForm(data.id).then((response) => { - if (this.displayFormData.id === data.id) { + if (this.displayFormData && this.displayFormData.id === data.id) { this.displayFormData = undefined } listForm({}).then(res => {