From 37238a4b2133db97b706d5e8d2a0905bd25f7667 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 12 May 2022 16:09:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E6=B5=8B=E8=AF=95):=20UI=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=B5=8B=E8=AF=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011918 --user=陈建星 【通用功能】测试报告-高级搜索：所属测试字段优化 https://www.tapd.cn/55049933/s/1157012
---
 .../base/mapper/ext/ExtApiScenarioReportMapper.xml         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 83dad3f4da..c7c905e002 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -105,7 +105,11 @@
                 <property name="object" value="${condition}.name"/>
             </include>
         </if>
-        <if test="${condition}.testName != null">
+        <if test="${isUi} and ${condition}.testName != null">
+            and `scenario_id` IN
+            (SELECT id FROM ui_scenario WHERE name like CONCAT('%',  #{${condition}.testName.value},'%') )
+        </if>
+        <if test="!${isUi} and ${condition}.testName != null">
             and `scenario_id` IN
                 (SELECT id FROM api_scenario WHERE name like CONCAT('%',  #{${condition}.testName.value},'%') )
         </if>
@@ -154,6 +158,7 @@
                 <include refid="listCombine">
                     <property name="condition" value="request.combine"/>
                     <property name="name" value="request.name"/>
+                    <property name="isUi" value="request.isUi"/>
                 </include>
             </if>