From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index d2aafeb..e55dd25 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -48,11 +48,13 @@
<result property="ivrtext" column="ivrtext"/>
<result property="groupName" column="group_name"/>
<result property="scriptTopic" column="script_topic"/>
+ <result property="assortid" column="assortid"/>
</resultMap>
<sql id="selectIvrTaskTemplateScriptVo">
select id,
taskid,
+ assortid,
sort,
ivrtext,
script_type,
@@ -80,9 +82,10 @@
<select id="selectIvrTaskTemplateScriptList" parameterType="com.smartor.domain.IvrTaskTemplateScript"
resultMap="IvrTaskTemplateScriptResult">
<include refid="selectIvrTaskTemplateScriptVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
<if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="assortid != null ">and assortid = #{assortid}</if>
<if test="score != null ">and score = #{score}</if>
<if test="scriptTopic != null ">and script_topic = #{scriptTopic}</if>
<if test="ivrtext != null ">and ivrtext = #{ivrtext}</if>
@@ -122,7 +125,6 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
- </where>
</select>
<select id="selectIvrTaskTemplateScriptByID" parameterType="Long" resultMap="IvrTaskTemplateScriptResult">
@@ -175,6 +177,7 @@
<if test="score != null ">score,</if>
<if test="ivrtext != null ">ivrtext,</if>
<if test="scriptTopic != null ">script_topic,</if>
+ <if test="assortid != null ">assortid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -218,6 +221,7 @@
<if test="score != null ">#{score},</if>
<if test="ivrtext != null ">#{ivrtext},</if>
<if test="scriptTopic != null ">#{scriptTopic},</if>
+ <if test="assortid != null ">#{assortid},</if>
</trim>
</insert>
@@ -267,6 +271,7 @@
<if test="score != null">score = #{score},</if>
<if test="ivrtext != null">ivrtext = #{ivrtext},</if>
<if test="scriptTopic != null ">script_topic = #{scriptTopic},</if>
+ <if test="assortid != null ">assortid = #{assortid},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3