From f40e87fcba78af38409d3f57a2652c054087d731 Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Tue, 27 Oct 2020 17:55:29 +0800
Subject: [PATCH] REPORT-40027 NPE

---
 .../src/main/java/com/fr/design/mainframe/JForm.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index 03934d035..b7fb90fcb 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -310,7 +310,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         addJTemplateActionListener(new JTemplateActionListenerAdapter() {
             @Override
             public void templateClosed(JTemplate<?, ?> jt) {
-                String key = jt.getEditingFILE().getPath() + template.getTemplateID();
+                if (jt == null) {
+                    return;
+                }
+                String key = jt.getEditingFILE().getPath() + jt.getTarget().getTemplateID();
                 FormHierarchyTreePane.getInstance().removeTreePath(key);
             }
         });