Merge branch 'master-where标签替换'

陈昶聿

3 天以前 d2d33d9e10b6a68b84a43a1b970a94246ffdf801

 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>