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/IvrLibaTemplateScriptMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index 255d283..b7163f5 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -48,12 +48,14 @@
         <result property="sort" column="sort"/>
         <result property="score" column="score"/>
         <result property="groupName" column="group_name"/>
+        <result property="assortid" column="assortid"/>
     </resultMap>
 
     <sql id="selectIvrLibaTemplateScriptVo">
         select id,
                scriptno,
                sort,
+               assortid,
                group_name,
                branch_flag,
                branch_nextscriptno,
@@ -99,9 +101,10 @@
     <select id="selectIvrLibaTemplateScriptList" parameterType="com.smartor.domain.IvrLibaTemplateScript"
             resultMap="IvrLibaTemplateScriptResult">
         <include refid="selectIvrLibaTemplateScriptVo"/>
-        <where>
-            del_flag=0
+        where 1=1
+            and del_flag = 0
             <if test="scriptno != null ">and scriptno = #{scriptno}</if>
+            <if test="assortid != null ">and assortid = #{assortid}</if>
             <if test="groupName != null ">and group_name = #{groupName}</if>
             <if test="scriptDesc != null ">and script_desc = #{scriptDesc}</if>
             <if test="templateid != null ">and templateid = #{templateid}</if>
@@ -142,7 +145,6 @@
             <if test="scriptType != null">and script_type = #{scriptType}</if>
             <if test="sort != null">and sort = #{sort}</if>
             <if test="score != null">and score = #{score}</if>
-        </where>
     </select>
 
     <select id="selectIvrLibaTemplateScriptByID" parameterType="Long" resultMap="IvrLibaTemplateScriptResult">
@@ -196,6 +198,7 @@
             <if test="score != null ">score,</if>
             <if test="ivrtext != null ">ivrtext,</if>
             <if test="groupName != null ">group_name,</if>
+            <if test="assortid != null ">assortid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="scriptno != null">#{scriptno},</if>
@@ -239,6 +242,7 @@
             <if test="score != null ">#{score},</if>
             <if test="ivrtext != null ">#{ivrtext},</if>
             <if test="groupName != null ">#{groupName},</if>
+            <if test="assortid != null ">#{assortid},</if>
         </trim>
     </insert>
 
@@ -284,6 +288,7 @@
             <if test="branchFlag != null  and branchFlag != ''">branch_flag = #{branchFlag},</if>
             <if test="score != null ">score = #{score},</if>
             <if test="groupName != null ">group_name = #{groupName},</if>
+            <if test="assortid != null ">assortid = #{assortid},</if>
             <if test="branchNextscriptno != null  and branchNextscriptno != ''">branch_nextscriptno =
                 #{branchNextscriptno},
             </if>

--
Gitblit v1.9.3