From bbb11660e9a5a5e0f231776a49ab377a51583b86 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Sat, 14 Sep 2024 11:51:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E7=94=A8=E4=BE=8B=E6=95=B0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046336 --user=陈建星 【接口测试】定义-筛选-选中所有字段筛选后提示sql异常 https://www.tapd.cn/55049933/s/1578782
---
 .../api/mapper/ExtApiDefinitionMapper.java    |  2 +-
 .../api/mapper/ExtApiDefinitionMapper.xml     | 49 ++++++++++++++++++-
 .../ApiDefinitionExportService.java           |  2 +-
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
index e84bb4ddc5..72827319c5 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
@@ -34,7 +34,7 @@ public interface ExtApiDefinitionMapper {
     List<String> getIds(@Param("request") TableBatchProcessDTO request, @Param("projectId") String projectId, @Param("protocols") List<String> protocols, @Param("deleted") boolean deleted);
 
     @BaseConditionFilter
-    List<String> getIdsBySort(@Param("request") TableBatchProcessDTO request, @Param("projectId") String projectId, @Param("protocols") List<String> protocols, @Param("orderColumns") String orderColumns);
+    List<String> getIdsBySort(@Param("request") TableBatchProcessDTO request, @Param("projectId") String projectId, @Param("protocols") List<String> protocols, @Param("orderColumns") String orderColumns, @Param("deleted") boolean deleted);
 
     List<String> getRefIds(@Param("ids") List<String> ids, @Param("deleted") boolean deleted);
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index 46f51df0fc..c57fdec10f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -92,7 +92,7 @@
     <select id="getIdsBySort" resultType="java.lang.String">
         SELECT id
         FROM api_definition
-        where project_id = #{projectId} and deleted is false
+        where project_id = #{projectId} and deleted = #{deleted}
         <if test="protocols != null and protocols.size() > 0">
             AND protocol in
             <foreach collection="protocols" item="protocol" separator="," open="(" close=")">
@@ -281,6 +281,8 @@
 
         <include refid="combine">
             <property name="combineSearch" value="request.combineSearch"/>
+            <property name="projectId" value="${request.projectId}"/>
+            <property name="deleted" value="${request.deleted}"/>
         </include>
 
         <include refid="queryVersionCondition">
@@ -415,6 +417,47 @@
                             <property name="column" value="api_definition.path"/>
                         </include>
                     </if>
+                    <if test="condition.name == 'caseTotal'">
+                        <choose>
+                            <when test="condition.operator == 'NOT_EMPTY'">
+                                api_definition.id in (
+                                    select api_definition_id from api_test_case where deleted = ${deleted}
+                                    and project_id = '${projectId}'
+                                )
+                            </when>
+                            <when test="condition.operator == 'EMPTY'">
+                                api_definition.id not in (
+                                    select api_definition_id from api_test_case where deleted = ${deleted}
+                                    and project_id = '${projectId}'
+                                )
+                            </when>
+                            <when test="(condition.operator == 'LT' and condition.value &lt; 1) or (condition.operator == 'EQUALS' and condition.value &lt; 0)">
+                                1=2
+                            </when>
+                            <otherwise>
+                                <if test="condition.operator == 'LT' or (condition.operator == 'EQUALS' and condition.value == 0)">
+                                    api_definition.id not in (
+                                        select api_definition_id from api_test_case where deleted = ${deleted}
+                                        and project_id = '${projectId}'
+                                    )
+                                    <if test="condition.value &gt; 1">
+                                        OR
+                                    </if>
+                                </if>
+                                <if test="(condition.operator == 'EQUALS' and condition.value &gt; 0) or (condition.operator == 'LT' and condition.value &gt; 1) or condition.operator == 'GT'">
+                                    api_definition.id in (
+                                        select api_definition_id from api_test_case where deleted = ${deleted}
+                                        and project_id = '${projectId}'
+                                        group by api_definition_id having
+                                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                            <property name="condition" value="condition"/>
+                                            <property name="column" value="count(id)"/>
+                                        </include>
+                                    )
+                                </if>
+                            </otherwise>
+                        </choose>
+                    </if>
                     <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
                         <property name="searchMode" value="${combineSearch}.searchMode"/>
                     </include>
@@ -453,8 +496,10 @@
     <sql id="queryWhereConditionByBaseQueryRequest">
         <include refid="combine">
             <property name="combineSearch" value="request.condition.combineSearch"/>
+            <property name="projectId" value="${projectId}"/>
+            <property name="deleted" value="${deleted}"/>
         </include>
-        <if test="request.condition.keyword != null">
+        <if test="request.condition.keyword != null and request.condition.keyword != ''">
             and (
             api_definition.num like concat('%', #{request.condition.keyword},'%')
             or api_definition.name like concat('%', #{request.condition.keyword},'%')
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
index c8b7931b5c..cf0b14f39a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
@@ -210,7 +210,7 @@ public class ApiDefinitionExportService {
 
         if (request.isSelectAll()) {
             String sortString = StringUtils.isBlank(request.getSortString()) ? "pos desc,id desc" : request.getSortString();
-            List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, sortString);
+            List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, sortString, false);
             if (CollectionUtils.isNotEmpty(request.getExcludeIds())) {
                 ids.removeAll(request.getExcludeIds());
             }