From cfb8375ad5d343a58a1de405041753fc797e2655 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 14 Jun 2024 19:24:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2=E9=9B=86=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=8A=A5=E9=94=99=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=1042216 --user=王孝刚 【项目任务中心】批量执行CASE/场景-集合报告-在任务中心停止报错
https://www.tapd.cn/55049933/s/1529628
---
 .../main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml  | 2 +-
 .../io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml    | 2 +-
 .../java/io/metersphere/api/service/ApiReportShareService.java  | 1 +
 3 files changed, 3 insertions(+), 2 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 3b6565c7f7..de7f200942 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
@@ -214,7 +214,7 @@
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
        select distinct ar.* , project.organization_id ,
         ar.test_plan_case_id as testPlanId,
-        if (ar.test_plan_case_id = 'NONE' , a.api_test_case_id , ar.test_plan_case_id) as resourceId from api_report ar
+        if (ar.test_plan_case_id = 'NONE' and ar.integrated =0, a.api_test_case_id , ar.test_plan_case_id) as resourceId from api_report ar
         LEFT JOIN api_test_case_record a ON ar.id = a.api_report_id
         LEFT JOIN api_test_case c ON a.api_test_case_id = c.id
         left join project on ar.project_id = project.id
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 9270c245f9..6d95ef4376 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
@@ -107,7 +107,7 @@
 
         select distinct asr.*, project.organization_id,
         asr.test_plan_scenario_id as testPlanId,
-        if (asr.test_plan_scenario_id = 'NONE' , a.api_scenario_id , asr.test_plan_scenario_id) as resourceId
+        if (asr.test_plan_scenario_id = 'NONE'  and asr.integrated =0 , a.api_scenario_id , asr.test_plan_scenario_id) as resourceId
          from api_scenario_report asr
         left join api_scenario_record a on asr.id = a.api_scenario_report_id
         left JOIN api_scenario s on a.api_scenario_id = s.id
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiReportShareService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiReportShareService.java
index d097b95a1a..1473bafeb8 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiReportShareService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiReportShareService.java
@@ -114,6 +114,7 @@ public class ApiReportShareService {
         request.setCreateUser(userId);
         request.setCustomData(shareRequest.getReportId().getBytes());
         request.setShareType(ShareInfoType.API_SHARE_REPORT.name());
+        request.setProjectId(shareRequest.getProjectId());
         ShareInfo shareInfo = createShareInfo(request);
         return conversionShareInfoToDTO(shareInfo);
     }