From a2307dd4288eded69b5d307f04477c12f6764332 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 3 Apr 2023 19:54:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84mock=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
---
 .../base/mapper/ext/ExtMockExpectConfigMapper.xml    | 12 +++++-------
 .../service/definition/ApiDefinitionService.java     |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
index 0c7ea7b06d..c456e75ab5 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
@@ -14,16 +14,14 @@
     </select>
     <select id="selectByApiIdIn" resultType="io.metersphere.api.dto.mock.config.MockConfigImportDTO">
         SELECT
-            mock_expect_config.*,
-            mock_config.api_id AS apiId
+            mock_expect_config.*,mock_config.api_id AS apiId
         FROM
             mock_expect_config
         LEFT JOIN mock_config ON mock_expect_config.mock_config_id = mock_config.id
-        WHERE mock_config.api_id in (
-            <foreach collection="values" item="value" separator="," open="(" close=")">
-                #{value}
-            </foreach>
-        )
+        WHERE mock_config.api_id in
+        <foreach collection="values" item="value" separator="," open="(" close=")">
+            #{value}
+        </foreach>
     </select>
 
     <select id="selectExlectNumByMockConfigId" resultType="java.lang.String">
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
index 1cd3b90f7d..91dfb71a37 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
@@ -1438,6 +1438,7 @@ public class ApiDefinitionService {
 
     public ApiExportResult export(ApiBatchRequest request, String type) {
         ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extApiDefinitionMapper.selectIds(query));
+        LogUtil.info("导出总量 ",request.getIds());
 
         List<ApiDefinitionWithBLOBs> apiDefinitions = getByIds(request.getIds());
 
@@ -1450,6 +1451,7 @@ public class ApiDefinitionService {
             msApiExportResult.setProtocol(request.getProtocol());
             msApiExportResult.setProjectId(request.getProjectId());
             msApiExportResult.setVersion(System.getenv("MS_VERSION"));
+            LogUtil.info("导出数据组装完成 ",request.getIds());
             return msApiExportResult;
         } else { //  导出为 Swagger 格式
             Swagger3Parser swagger3Parser = new Swagger3Parser();