From cd617558a36ce40cac01eb98027105784f492eaa Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 2 Jun 2023 11:10:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93=E5=A4=9A=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/request/BaseQueryRequest.java |  5 --
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 49 ++++++-------------
 .../testcase/TestCaseBatchRequest.java        |  9 ----
 .../service/TestCaseNodeService.java          |  1 +
 .../metersphere/service/TestCaseService.java  |  1 +
 5 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/request/BaseQueryRequest.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/request/BaseQueryRequest.java
index fb2ca50856..25a5ff14ee 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/request/BaseQueryRequest.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/request/BaseQueryRequest.java
@@ -69,11 +69,6 @@ public class BaseQueryRequest {
      */
     private Map<String, Object> combine;
 
-    /**
-     * 要查询的字段
-     */
-    private List<String> selectFields;
-
     /**
      * 版本 ID
      */
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 2bad2c4812..bb3913f88a 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -288,20 +288,13 @@
         project_version.id as versionId,
         test_case.last_execute_result,
         test_case.prerequisite, test_case.steps, remark, test_case.expected_result, test_case.step_description,
-        <if test="request.selectFields != null and request.selectFields.size() > 0">
-            <foreach collection="request.selectFields" item="field" separator=",">
-                ${field}
-            </foreach>
-        </if>
-        <if test="request.selectFields == null or request.selectFields.size() == 0">
-            test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
-            test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
-            test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
-            test_case.review_status, test_case.tags,
-            test_case.demand_id, test_case.demand_name, test_case.`status`,
-            test_case.custom_num, test_case.step_model, test_case.create_user,
-            test_case.ref_id,test_case.latest
-        </if>
+        test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
+        test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
+        test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
+        test_case.review_status, test_case.tags,
+        test_case.demand_id, test_case.demand_name, test_case.`status`,
+        test_case.custom_num, test_case.step_model, test_case.create_user,
+        test_case.ref_id,test_case.latest
         from test_case
         left join project_version on project_version.id = test_case.version_id
         <include refid="queryWhereCondition"/>
@@ -311,22 +304,15 @@
     <select id="publicList" resultType="io.metersphere.dto.TestCaseDTO">
         select
         test_case.last_execute_result,
-        <if test="request.selectFields != null and request.selectFields.size() > 0">
-            <foreach collection="request.selectFields" item="field" separator=",">
-                ${field}
-            </foreach>
-        </if>
-        <if test="request.selectFields == null or request.selectFields.size() == 0">
-            test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
-            test_case.version_id,
-            test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
-            test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
-            test_case.review_status, test_case.tags,
-            test_case.demand_id, test_case.demand_name, test_case.`status`,
-            test_case.custom_num, test_case.step_model, test_case.create_user,
-            test_case.custom_fields,test_case.case_public ,
-            project.workspace_id , project.name as projectName ,test_case.ref_id ,test_case.`order`
-        </if>
+        test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
+        test_case.version_id,
+        test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
+        test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
+        test_case.review_status, test_case.tags,
+        test_case.demand_id, test_case.demand_name, test_case.`status`,
+        test_case.custom_num, test_case.step_model, test_case.create_user,
+        test_case.custom_fields,test_case.case_public ,
+        project.workspace_id , project.name as projectName ,test_case.ref_id ,test_case.`order`
         from test_case
         inner join project on test_case.project_id = project.id and workspace_id = #{request.workspaceId}
         inner join project_version ON test_case.version_id = project_version.id
@@ -398,9 +384,6 @@
                 test_case.`${order.name}` ${order.type}
             </foreach>
         </if>
-        <if test="request.pageCount != 0">
-            limit ${request.pageStart}, ${request.pageCount}
-        </if>
     </select>
 
     <select id="getMaxNumByProjectId" resultType="io.metersphere.base.domain.TestCase">
diff --git a/test-track/backend/src/main/java/io/metersphere/request/testcase/TestCaseBatchRequest.java b/test-track/backend/src/main/java/io/metersphere/request/testcase/TestCaseBatchRequest.java
index b368b66f87..17d210897c 100644
--- a/test-track/backend/src/main/java/io/metersphere/request/testcase/TestCaseBatchRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/request/testcase/TestCaseBatchRequest.java
@@ -25,15 +25,6 @@ public class TestCaseBatchRequest extends TestCaseWithBLOBs {
      */
     private Boolean exportAll = false;
 
-    /**
-     * v2.9 大批量导出分页参数
-     * pageStart: 偏移量
-     * pageCount: 数目
-     */
-    private int pageStart = 0;
-
-    private int pageCount = 0;
-
     @Getter
     @Setter
     public static class CustomFiledRequest {
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
index 52f97b0c50..b58cecd74e 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
@@ -265,6 +265,7 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
     }
 
     public List<TestCaseNodeDTO> getPublicCaseNode(String workspaceId, QueryTestCaseRequest request) {
+        ServiceUtils.buildCombineTagsToSupportMultiple(request);
         request.setWorkspaceId(workspaceId);
         request.setProjectId(null);
         request.setNodeIds(null);
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
index e4fe34e407..6677fc087d 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
@@ -883,6 +883,7 @@ public class TestCaseService {
     }
 
     public List<TestCaseDTO> publicListTestCase(QueryTestCaseRequest request) {
+        ServiceUtils.buildCombineTagsToSupportMultiple(request);
         List<TestCaseDTO> returnList = extTestCaseMapper.publicList(request);
         ServiceUtils.buildProjectInfo(returnList);
         buildUserInfo(returnList);