diff --git a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java
index 103bf5ee39..03486a612f 100644
--- a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java
+++ b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java
@@ -215,7 +215,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi
                         WARNING_MESSAGE);
                 return;
             }
-            doPaste(targetDir, pasteNodes);
+            doPaste(targetDir, treeNodeList);
         }
 
         /**
@@ -256,7 +256,10 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi
                 for (ExpandMutableTreeNode node : pasteNodes) {
                     if (node.getUserObject() instanceof FileNode) {
                         FileNode fileNode = (FileNode) node.getUserObject();
-                        targetFile = FileOperationHelper.getInstance().copyFile(fileNode, targetDir);
+                        String newTargetFile = FileOperationHelper.getInstance().copyFile(fileNode, targetDir);
+                        if (TemplateResourceManager.getResource().exist(newTargetFile)) {
+                            targetFile = newTargetFile;
+                        }
                         FineLoggerFactory.getLogger().debug("Template: {} paste to {} success.", fileNode.getEnvPath(), targetDir);
                     }
                 }