From a46a9879a5bda4a8d858e8aaa20dce9bdc7c0721 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 17 Apr 2024 15:12:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=9C=BA=E6=99=AF=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1039094 --user=王孝刚 【项目任务中心】场景任务列表-按ID搜索抱参数校验失败
https://www.tapd.cn/55049933/s/1499782
---
 .../metersphere/api/mapper/ExtApiReportMapper.xml | 13 ++++++++-----
 .../api/mapper/ExtApiScenarioReportMapper.xml     | 15 +++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
index bfc6bc06d2..2debbcd7d1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
@@ -215,26 +215,29 @@
         </include>
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
-        select id, pool_id from api_report where
+        select id, pool_id from  (select ar.* , project.organization_id from api_report ar
+                           left join project on ar.project_id = project.id ) as api_report
+
+                           where
         api_report.deleted = false
         and api_report.test_plan_id = 'NONE'
         and api_report.start_time BETWEEN #{startTime} AND #{endTime}
-        and status in ('PENDING', 'RUNNING', 'RERUNNING')
+        and api_report.status in ('PENDING', 'RUNNING', 'RERUNNING')
         <if test="ids != null and ids.size() > 0">
-            and id in
+            and api_report.id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
         <if test="projectIds != null and projectIds.size() > 0">
-            and project_id in
+            and api_report.project_id in
             <foreach collection="projectIds" item="projectId" open="(" separator="," close=")">
                 #{projectId}
             </foreach>
         </if>
         <if test="request.condition.keyword != null">
             and (
-            name like concat('%', #{request.condition.keyword},'%')
+            api_report.name like concat('%', #{request.condition.keyword},'%')
             )
         </if>
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
index c389c30870..ea580921dc 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
@@ -111,26 +111,29 @@
           and api_scenario_report.project_id = #{projectId} limit 500
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
-        select id, pool_id from api_scenario_report where
+        select id, pool_id from (
+        select asr.*, p.organization_id from api_scenario_report asr
+                      left join project p on asr.project_id = p.id ) as api_scenario_report
+                      where
         api_scenario_report.deleted = false
         and api_scenario_report.test_plan_id = 'NONE'
         and api_scenario_report.start_time BETWEEN #{startTime} AND #{endTime}
-        and status in ('PENDING', 'RUNNING', 'RERUNNING')
+        and api_scenario_report.status in ('PENDING', 'RUNNING', 'RERUNNING')
         <if test="ids != null and ids.size() > 0">
-            and id in
+            and api_scenario_report.id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
         <if test="projectIds != null and projectIds.size() > 0">
-            and project_id in
+            and api_scenario_report.project_id in
             <foreach collection="projectIds" item="projectId" open="(" separator="," close=")">
                 #{projectId}
             </foreach>
         </if>
         <if test="request.condition.keyword != null">
             and (
-            name like concat('%', #{request.condition.keyword},'%')
+            api_scenario_report.name like concat('%', #{request.condition.keyword},'%')
             )
         </if>
         <include refid="filters">
@@ -184,7 +187,7 @@
         <if test="request.keyword != null and request.keyword != ''">
             and (
             api_scenario_report.resourceName like concat('%', #{request.keyword},'%')
-                or api_scenario_report.resourceId like concat('%', #{request.keyword},'%')
+                or api_scenario_report.resourceNum like concat('%', #{request.keyword},'%')
                )
         </if>
         <include refid="filters">