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/SvyLibScriptOptionMapper.xml |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
index e228f54..5e567db 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
+++ b/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>

--
Gitblit v1.9.3