From af19dab80bf15f435d63bf7c24f4967b63bfd1c3 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 24 May 2024 16:00:52 +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=8Dmock=E5=8F=AA=E8=AF=BB=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=A4=8D=E5=88=B6mock=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=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=1041184 --user=王孝刚 【接口测试】Mock权限-只有查询权限的用户，不能使用复制Mock地址的功能
https://www.tapd.cn/55049933/s/1520656
---
 .../api/mapper/ExtApiScenarioReportMapper.java    |  2 +-
 .../api/mapper/ExtApiScenarioReportMapper.xml     |  1 -
 .../scenario/ApiScenarioReportService.java        | 15 +--------------
 .../components/management/mock/mockTable.vue      |  2 +-
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
index d2d7359d9d..bf2bc24750 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
@@ -51,7 +51,7 @@ public interface ExtApiScenarioReportMapper {
 
     void updateApiScenario(List<String> ids);
 
-    List<ApiScenarioReportStepDTO> selectStepDetailByReportId(@Param("id") String id, @Param("limit") int limit, @Param("offset") int offset);
+    List<ApiScenarioReportStepDTO> selectStepDetailByReportId(@Param("id") String id);
 
     List<ApiReportMessageDTO> getNoticeList(@Param("ids") List<String> ids);
 
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 428516fef9..6ff4806aa3 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
@@ -222,7 +222,6 @@
                api_scenario_report_detail.sort as loopIndex
         from api_scenario_report_detail
         where api_scenario_report_detail.report_id = #{id}
-        limit #{limit} offset #{offset}
     </select>
     <select id="getNoticeList" resultType="io.metersphere.system.dto.sdk.ApiReportMessageDTO">
         select id ,name from api_scenario_report
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
index 2cd8bec6da..c8ab3db63b 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
@@ -192,20 +192,7 @@ public class ApiScenarioReportService {
         //需要查询出所有的步骤
         List<ApiScenarioReportStepDTO> scenarioReportSteps = extApiScenarioReportMapper.selectStepByReportId(id);
         //查询所有步骤的detail
-        ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
-        detailExample.createCriteria().andReportIdEqualTo(id);
-        long detailCount = apiScenarioReportDetailMapper.countByExample(detailExample);
-        // 分批查询 一次性查询1000个  超过50000个也只查询50000条
-        if (detailCount > MAX) {
-            detailCount = MAX;
-        }
-        int remainingCount = (int) detailCount;
-        List<ApiScenarioReportStepDTO> deatilList = new ArrayList<>();
-        for (int i = 0; i < detailCount; i += BATCH_SIZE) {
-            int currentBatchSize = Math.min(BATCH_SIZE, remainingCount);
-            deatilList.addAll(extApiScenarioReportMapper.selectStepDetailByReportId(id, currentBatchSize, i));
-            remainingCount -= currentBatchSize;
-        }
+        List<ApiScenarioReportStepDTO> deatilList = extApiScenarioReportMapper.selectStepDetailByReportId(id);
 
         //根据stepId进行分组
         Map<String, List<ApiScenarioReportStepDTO>> detailMap = deatilList.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getStepId));
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
index 256f5a84c2..be91cd0d85 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
@@ -369,7 +369,7 @@
       eventTag: 'copyMock',
       label: t('mockManagement.copyMock'),
       danger: false,
-      permission: ['PROJECT_API_DEFINITION_MOCK:READ+ADD'],
+      permission: ['PROJECT_API_DEFINITION_MOCK:READ'],
     },
     {
       eventTag: 'delete',