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/IvrTaskTemplateMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
index 78560d3..7873b2e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
@@ -91,8 +91,8 @@
<select id="selectIvrTaskTemplateList" parameterType="com.smartor.domain.IvrTaskTemplate"
resultMap="IvrTaskTemplateResult">
<include refid="selectIvrTaskTemplateVo"/>
- <where>
- del_flat=0
+ where 1=1
+ and del_flag = 0
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="sendDay != null ">and send_day = #{sendDay}</if>
<if test="id != null ">and id = #{id}</if>
@@ -150,12 +150,12 @@
<if test="recallcount != null">and recallcount = #{prologrecallcountue}</if>
<if test="deptCode != null">and dept_code = #{deptCode}</if>
<if test="longTemp != null">and long_temp = #{longTemp}</if>
- </where>
</select>
<select id="selectIvrTaskTemplateByID" parameterType="Long" resultMap="IvrTaskTemplateResult">
<include refid="selectIvrTaskTemplateVo"/>
- where id = #{id} and del_flag=0
+ where id = #{id}
+ and del_flag=0
</select>
<insert id="insertIvrTaskTemplate" parameterType="com.smartor.domain.IvrTaskTemplate" useGeneratedKeys="true"
@@ -190,7 +190,7 @@
<if test="deptIds != null">deptIds,</if>
<if test="deptNames != null">dept_names,</if>
<if test="fKsdm != null">F_KSDM,</if>
- <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ del_flag,
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
@@ -249,7 +249,7 @@
<if test="deptIds != null">#{deptIds},</if>
<if test="deptNames != null">#{deptNames},</if>
<if test="fKsdm != null">#{fKsdm},</if>
- <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ '0',
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
--
Gitblit v1.9.3