From 95e12b1b01a17bd49a46d2e034eaeb7cda83ad80 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 27 Oct 2022 16:34:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcase=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E6=90=9C=E7=B4=A2=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017838 --user=王孝刚 【接口测试】接口case-高级搜索-执行结果+用例等级组合搜索提示sql错误
https://www.tapd.cn/55049933/s/1280433
---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index fb602f1655..68fcee1883 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -114,27 +114,12 @@
                 <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
                     #{v}
                 </foreach>
-                <if test="${object}.value.contains(''.toString()) or ${object}.value.contains('PENDING'.toString())">
-                    or t1.status is null or t1.status = ''
-                </if>
-                <if test="${condition}.exec_result != null">
-                    )
-                </if>
             </when>
             <when test='${object}.operator == "not in"'>
                 not in
                 <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
                     #{v}
                 </foreach>
-                <if test="${condition}.exec_result != null and (${object}.value.contains(''.toString()) or ${object}.value.contains('PENDING'.toString()))">
-                    and t1.status is not null and t1.status != ''
-                </if>
-                <if test="${condition}.exec_result != null and !${object}.value.contains('PENDING'.toString())">
-                    or t1.status is null or t1.status = ''
-                </if>
-                <if test="${condition}.exec_result != null">
-                    )
-                </if>
             </when>
             <when test='${object}.operator == "between"'>
                 between #{${object}.value[0]} and #{${object}.value[1]}
@@ -240,9 +225,35 @@
         </if>
         <if test="${condition}.exec_result != null">
             and (t1.status
-            <include refid="condition">
-                <property name="object" value="${condition}.exec_result"/>
-            </include>
+            <choose>
+                <when test='${condition}.exec_result.operator == "in"'>
+                    in
+                    <foreach collection="${condition}.exec_result.value" item="v" separator="," open="(" close=")">
+                        #{v}
+                    </foreach>
+                    <if test="${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING')">
+                        or t1.status is null or t1.status = ''
+                    </if>
+                    <if test="${condition}.exec_result != null">
+                        )
+                    </if>
+                </when>
+                <when test='${condition}.exec_result.operator == "not in"'>
+                    not in
+                    <foreach collection="${condition}.exec_result.value" item="v" separator="," open="(" close=")">
+                        #{v}
+                    </foreach>
+                    <if test="${condition}.exec_result != null and (${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING'))">
+                        and t1.status is not null and t1.status != ''
+                    </if>
+                    <if test="${condition}.exec_result != null and !${condition}.exec_result.value.contains('PENDING')">
+                        or t1.status is null or t1.status = ''
+                    </if>
+                    <if test="${condition}.exec_result != null">
+                        )
+                    </if>
+                </when>
+            </choose>
         </if>
     </sql>