From 4d79d1c676e9967e886cbdead1fcd4417674025d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Mon, 29 Sep 2025 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmapper=E7=9A=84xml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/base/service/tmpltp/TemplateInstanceServiceImpl.java | 2 +-
 .../main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml | 2 +-
 .../main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
index c7f9d2f..668aeb1 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
@@ -273,7 +273,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
         newTpInstanceDO.setId(null);
         newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer()));
         newTpInstanceDO.setPublishTime(LocalDateTime.now());
-        newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt());
+        newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt()!=null?templateInstanceDO.getCntt():templateInstanceDO.getOrigCntt());//模板实例内容,默认为上一个版本的当前文件内容
         newTpInstanceDO.setCreateTime(null);
         newTpInstanceDO.setUpdateTime(null);
         templateInstanceMapper.insert(newTpInstanceDO);
diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml
index 2f2e0b8..21372a7 100644
--- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml
+++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml
@@ -13,7 +13,7 @@
         update BSE_TMPL_INSC_DAT
         set deleted = 1
         WHERE INSC_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
+        <foreach collection="templateInstanceIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml
index 8d98620..ba5b2ec 100644
--- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml
+++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml
@@ -17,7 +17,7 @@
         update BSE_TMPL_INSC_ITM
         set deleted = 1
         WHERE INSC_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
+        <foreach collection="templateInstanceIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>