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/SvyTaskTemplateTargetoptionMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
index 707a75f..695fdcc 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
@@ -72,7 +72,8 @@
<select id="selectSvyTaskTemplateTargetoptionList" parameterType="com.smartor.domain.SvyTaskTemplateTargetoption"
resultMap="SvyTaskTemplateTargetoptionResult">
<include refid="selectSvyTaskTemplateTargetoptionVo"/>
- <where>
+ where 1=1
+ 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>
@@ -99,8 +100,8 @@
<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 = #{nodynamiccruxsJson}</if>
- <if test="dynamiccruxs != null ">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>
@@ -108,7 +109,6 @@
<if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
<if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
<if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
- </where>
</select>
<select id="selectSvyTaskTemplateTargetoptionById" parameterType="Long"
--
Gitblit v1.9.3