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<ExtTableField> 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 => {