Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml

@@ -56,7 +56,7 @@
    <select id="selectIvrLibaExtemplatescriptList" parameterType="com.smartor.domain.IvrLibaExtemplatescript"
            resultMap="IvrLibaExtemplatescriptResult">
        <include refid="selectIvrLibaExtemplatescriptVo"/>
        <where>
        where 1=1
            <if test="extID != null">and extID = #{extID}</if>
            <if test="switchID != null ">and switchID = #{switchID}</if>
            <if test="switchText != null  and switchText != ''">and switchText = #{switchText}</if>
@@ -70,21 +70,19 @@
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="isEnd != null">and is_end = #{isEnd}</if>
        </where>
    </select>

    <select id="queryIvrLibaExtemplatescriptList" parameterType="com.smartor.domain.IvrLibaExtemplatescript"
            resultMap="IvrLibaExtemplatescriptResult">
        <include refid="selectIvrLibaExtemplatescriptVo"/>
        <where>
            del_flag = 0
        where 1=1
            and del_flag = 0
            <if test="IDs != null">
                and extID in
                <foreach collection="IDs" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>

    <select id="selectIvrLibaExtemplatescriptByID" parameterType="String" resultMap="IvrLibaExtemplatescriptResult">