From 472445f829d55b5a58a2d72019d08d8e9e05dc79 Mon Sep 17 00:00:00 2001 From: roger Date: Wed, 31 Aug 2022 16:21:10 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-79492=20=E5=A4=8D=E5=88=B6=E5=A4=9A?= =?UTF-8?q?=E5=BC=A0=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=80?= =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=8C=E8=A7=A6=E5=8F=91=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E5=AE=9A=E4=BD=8D=E5=88=B0=E7=B2=98?= =?UTF-8?q?=E8=B4=B4=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/file/DefaultTemplateTreeDefineProcessor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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); } }