From b9ef3d90048720712eceb3c2fdedcfcb1176a030 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 23 Oct 2024 15:23:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E7=94=A8=E4=BE=8B=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1047857 --user=宋昌昌 【接口测试】定义-CASE-高级搜索-执行结果 为空-未搜索到数据-实际有执行结果为 -的数据 https://www.tapd.cn/55049933/s/1596471
---
 .../api/mapper/ExtApiTestCaseMapper.xml        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
index 20698c3379..7b6baf404a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
@@ -687,10 +687,20 @@
                         </if>
                         <!-- 执行结果 -->
                         <if test="condition.name == 'lastReportStatus'">
-                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                <property name="condition" value="condition"/>
-                                <property name="column" value="atc.last_report_status"/>
-                            </include>
+                            <choose>
+                                <when test="condition.operator == 'EMPTY'">
+                                    atc.last_report_status is null or atc.last_report_status = '' or atc.last_report_status = 'PENDING'
+                                </when>
+                                <when test="condition.operator == 'NOT_EMPTY'">
+                                    atc.last_report_status is not null and atc.last_report_status != '' and atc.last_report_status != 'PENDING'
+                                </when>
+                                <otherwise>
+                                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                        <property name="condition" value="condition"/>
+                                        <property name="column" value="atc.last_report_status"/>
+                                    </include>
+                                </otherwise>
+                            </choose>
                         </if>
                         <!-- 接口存在更新 -->
                         <if test="condition.name == 'apiChange'">