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

diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index db40df2..ac239ca 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="com.smartor.domain.IvrLibaScript" id="IvrLibaScriptResult">
         <result property="id" column="id"/>
+        <result property="assortid" column="assortid"/>
         <result property="scriptTopic" column="script_topic"/>
         <result property="scriptContent" column="script_content"/>
         <result property="ivrVoice" column="ivr_voice"/>
@@ -57,6 +58,7 @@
     <sql id="selectIvrLibaScriptVo">
         select id,
                suitway,
+               assortid,
                targetdesc,
                campus,
                deptNames,
@@ -88,8 +90,8 @@
     <select id="selectIvrLibaScriptList" parameterType="com.smartor.domain.IvrLibaScript"
             resultMap="IvrLibaScriptResult">
         <include refid="selectIvrLibaScriptVo"/>
-        <where>
-            del_flag=0
+        where 1=1
+            and del_flag = 0
             <if test="id != null ">and id = #{id}</if>
             <if test="deptIds != null  and deptIds != ''">and deptIds = #{deptIds}</if>
             <if test="deptNames != null  and deptNames != ''">and deptNames like concat('%', #{deptNames}, '%')</if>
@@ -131,7 +133,6 @@
             <if test="pid != null ">and pid = #{pid}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="otherdata != null  and otherdata != ''">and otherdata = #{otherdata}</if>
-        </where>
     </select>
 
     <select id="selectIvrLibaScriptByQuestionid" parameterType="String" resultMap="IvrLibaScriptResult">

--
Gitblit v1.9.3