From 987e38327f849e1b13d8541246dde08d877db0e8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 14:10:43 +0800
Subject: [PATCH] 【市一】调整mapper获取ordid

---
 smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
index e8dfe48..eedecf0 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
@@ -43,11 +43,15 @@
         <result property="score" column="score"/>
         <result property="score" column="score"/>
         <result property="prompt" column="prompt"/>
+        <result property="sendTaskid" column="send_taskid"/>
+        <result property="sendTaskname" column="send_taskname"/>
     </resultMap>
 
     <sql id="selectSvyTaskTemplateTargetoptionVo">
         select id,
                option_code,
+               send_taskid,
+               send_taskname,
                score,
                prompt,
                appendflag,
@@ -68,7 +72,10 @@
     <select id="selectSvyTaskTemplateTargetoptionList" parameterType="com.smartor.domain.SvyTaskTemplateTargetoption"
             resultMap="SvyTaskTemplateTargetoptionResult">
         <include refid="selectSvyTaskTemplateTargetoptionVo"/>
-        <where>
+        WHERE 1=1
+            <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
+
+            AND del_flag=0
             <if test="taskid != null ">and taskid = #{taskid}</if>
             <if test="score != null ">and score = #{score}</if>
             <if test="prompt != null ">and prompt = #{prompt}</if>
@@ -76,8 +83,8 @@
             <if test="targetid != null ">and targetid = #{targetid}</if>
             <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
             <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
-            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
-                '%')
+            <if test="categoryName != null  and categoryName != ''">
+                and categoryName like concat('%', #{categoryName},'%')
             </if>
             <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
             <if test="targetregex2 != null  and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
@@ -95,14 +102,16 @@
             <if test="pid != null ">and pid = #{pid}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="scriptid != null ">and scriptid = #{scriptid}</if>
-            <if test="nodynamiccruxs != null  and nodynamiccruxs != ''">and nodynamiccruxs = #{nodynamiccruxsJson}</if>
-            <if test="dynamiccruxs != null  and dynamiccruxs != ''">and dynamiccruxs = #{dynamiccruxsJson}</if>
+<!--            <if test="nodynamiccruxs != null ">and nodynamiccruxs = #{nodynamiccruxsJson}</if>-->
+<!--            <if test="dynamiccruxs != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>-->
             <if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
             <if test="picturePath != null  and picturePath != ''">and picture_path = #{picturePath}</if>
             <if test="optionCode != null">and option_code = #{optionCode}</if>
             <if test="appendflag != null">and appendflag = #{appendflag}</if>
             <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
-        </where>
+            <if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
+            <if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
+        
     </select>
 
     <select id="selectSvyTaskTemplateTargetoptionById" parameterType="Long"
@@ -151,7 +160,8 @@
             <if test="appenddesc != null">appenddesc,</if>
             <if test="score != null">score,</if>
             <if test="prompt != null">prompt,</if>
-
+            <if test="sendTaskid != null">send_taskid,</if>
+            <if test="sendTaskname != null">send_taskname,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskid != null">#{taskid},</if>
@@ -190,7 +200,8 @@
             <if test="appenddesc != null">#{appenddesc},</if>
             <if test="score != null">#{score},</if>
             <if test="prompt != null">#{prompt},</if>
-
+            <if test="sendTaskid != null">#{sendTaskid},</if>
+            <if test="sendTaskname != null">#{sendTaskname}</if>
         </trim>
     </insert>
 
@@ -233,6 +244,8 @@
             <if test="appenddesc != null">appenddesc = #{appenddesc},</if>
             <if test="score != null">score = #{score},</if>
             <if test="prompt != null">score = #{prompt},</if>
+            <if test="sendTaskid != null">send_taskid= #{sendTaskid},</if>
+            <if test="sendTaskname != null">send_taskname = #{sendTaskname},</if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3