Merge branch 'master-where标签替换'

陈昶聿

3 天以前 d2d33d9e10b6a68b84a43a1b970a94246ffdf801

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

@@ -78,14 +78,14 @@
               update_time,
               isupload,
               upload_time
        from svy_lib_ScriptOption
        from svy_lib_scriptoption
    </sql>

    <select id="selectSvyLibScriptOptionList" parameterType="com.smartor.domain.SvyLibScriptOption"
            resultMap="SvyLibScriptOptionResult">
        <include refid="selectSvyLibScriptOptionVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="topicid != null ">and topicid = #{topicid}</if>
            <if test="svyid != null ">and svyid = #{svyid}</if>
            <if test="topictype != null ">and topictype = #{topictype}</if>
@@ -114,7 +114,6 @@
            <if test="appendflag != null">and appendflag = #{appendflag}</if>
            <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
            <if test="picturePath != null">and picture_path = #{picturePath}</if>
        </where>
    </select>

    <select id="selectSvyLibScriptOptionByOptionid" parameterType="Long" resultMap="SvyLibScriptOptionResult">
@@ -124,7 +123,7 @@

    <insert id="insertSvyLibScriptOption" parameterType="com.smartor.domain.SvyLibScriptOption" useGeneratedKeys="true"
            keyProperty="id">
        insert into svy_lib_ScriptOption
        insert into svy_lib_scriptoption
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="topicid != null">topicid,</if>
            <if test="svyid != null">svyid,</if>
@@ -200,7 +199,7 @@
    </insert>

    <update id="updateSvyLibScriptOption" parameterType="com.smartor.domain.SvyLibScriptOption">
        update svy_lib_ScriptOption
        update svy_lib_scriptoption
        <trim prefix="SET" suffixOverrides=",">
            <if test="topicid != null">topicid = #{topicid},</if>
            <if test="svyid != null">svyid = #{svyid},</if>
@@ -240,7 +239,7 @@
    </update>

    <update id="deleteSvyLibScriptOptionByOptionid" parameterType="Long">
        update svy_lib_ScriptOption
        update svy_lib_scriptoption
        <trim prefix="SET" suffixOverrides=",">
            del_flag = 1
        </trim>
@@ -248,7 +247,7 @@
    </update>

    <delete id="deleteSvyLibScriptOptionByOptionids" parameterType="String">
        delete from svy_lib_ScriptOption where id in
        delete from svy_lib_scriptoption where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>