Merge pull request #4364 in DESIGN/design from final/10.0 to persist/10.0

* commit '1158743e95afea781b9ce2aed2c8772f87bc217a':
  REPORT-52824 10.0.16 模板另存不会生成新的模板id

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -1465,10 +1465,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             editingFILE = fileChooser.getSelectedFILE();
         }
 
-        // 在保存之前，初始化 templateID
+        //收集和生成templateID  因为是另存为操作 无论怎么样都需要重新生成templateID
-        if (StringUtils.isEmpty(this.template.getTemplateID())) {
+        initForCollect();
-            generateTemplateId();
-        }
 
         FILE finalEditingFILE = editingFILE;
         CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {