diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 0a464aa6d..16c1a7e8a 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -413,7 +413,7 @@ public class EnvChangeEntrance {
             @Override
             public void doOk() {
                 SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane));
-                if (!saveSomeTemplatePane.showSavePane()) {
+                if (!saveSomeTemplatePane.showSavePane(true)) {
                     // 用户取消保存时，取消切换目录操作
                     return;
                 }
diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
index c2b340dff..a686699e1 100644
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@@ -212,6 +212,28 @@ public class MultiTemplateTabPane extends JComponent {
         });
     }
 
+
+    /**
+     * 模板可以关闭的条件
+     */
+    class CloseCondition {
+        private CloseOption closeOption;
+
+        public CloseCondition(CloseOption closeOption) {
+            this.closeOption = closeOption;
+        }
+
+        public boolean shouldClose(JTemplate closeJTemplate, int tplIndex, int i) {
+            boolean matchOption = this.closeOption.shouldClose(tplIndex, i);
+            JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (currentTemplate == null) {
+                return matchOption;
+            }
+            return matchOption && ComparatorUtils.equals(closeJTemplate.getTemplateTabOperatorType(),
+                    currentTemplate.getTemplateTabOperatorType());
+        }
+    }
+
     enum CloseOption {
         Left(Toolkit.i18nText("Fine-Design_Close_templates_To_The_Left")) {
             @Override
@@ -324,14 +346,15 @@ public class MultiTemplateTabPane extends JComponent {
         public void actionPerformed(ActionEvent e) {
             //只有关闭所有模板才需要判断当前模板，关闭左侧、右侧、其他都不需要
             SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(option == CloseOption.All);
-            if (saveSomeTemplatePane.showSavePane(option, false)) {
+            CloseCondition closeCondition = new CloseCondition(option);
+            if (saveSomeTemplatePane.showSavePane(closeCondition, false)) {
 
                 JTemplate<?, ?>[] templates = new JTemplate<?, ?>[openedTemplate.size()];
                 for (int i = 0; i < openedTemplate.size(); i++) {
                     templates[i] = openedTemplate.get(i);
                 }
                 JTemplate<?, ?> currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                closeTemplate(templates, currentTemplate);
+                closeTemplate(closeCondition, templates, currentTemplate);
 
                 if (openedTemplate.size() == 0) {
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate();
@@ -346,10 +369,9 @@ public class MultiTemplateTabPane extends JComponent {
             }
         }
 
-        private void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
-            String operator =  currentTemplate.getTemplateTabOperatorType();
+        private void closeTemplate(CloseCondition closeCondition, JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
             for (int i = 0; i < templates.length; i++) {
-                if (option.shouldClose(tplIndex, i) && ComparatorUtils.equals(operator, templates[i].getTemplateTabOperatorType())) {
+                if (closeCondition.shouldClose(templates[i], tplIndex, i)) {
                     JTemplate<?, ?> jTemplate = templates[i];
                     if (jTemplate == currentTemplate) {
                         currentTemplate = option == CloseOption.All ? null : templates[tplIndex];
diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
index e371f6ce2..18c34e808 100644
--- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
@@ -180,7 +180,7 @@ public class SaveSomeTemplatePane extends BasicPane {
      * @param judgeJTemplateMustSave 模板是否必须保存
      * @return
      */
-    public boolean showSavePane(@Nullable MultiTemplateTabPane.CloseOption option, boolean judgeJTemplateMustSave) {
+    public boolean showSavePane(@Nullable MultiTemplateTabPane.CloseCondition option, boolean judgeJTemplateMustSave) {
         initAndPopulate(option, judgeJTemplateMustSave);
         //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目
         if (!unSavedTemplate.isEmpty()) {
@@ -195,13 +195,13 @@ public class SaveSomeTemplatePane extends BasicPane {
         return HistoryTemplateListPane.getInstance().getHistoryList();
     }
 
-    private void initAndPopulate(@Nullable MultiTemplateTabPane.CloseOption option, boolean judgeJTemplateMustSave) {
+    private void initAndPopulate(@Nullable MultiTemplateTabPane.CloseCondition option, boolean judgeJTemplateMustSave) {
         java.util.List<JTemplate<?, ?>> opendedTemplate = getOpenedTemplatesToProcess();
         JTemplate<?, ?> currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         int currentIndex = opendedTemplate.indexOf(currentTemplate);
         for (int i = 0; i < opendedTemplate.size(); i++) {
             //满足关闭条件的才继续判断文件是否发生了改动
-            boolean needClose = option == null || option.shouldClose(currentIndex, i);
+            boolean needClose = option == null || option.shouldClose(opendedTemplate.get(i), currentIndex, i);
             if (needClose && isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
                 unSavedTemplate.add(opendedTemplate.get(i));
             }