From 32a41d56e814c1c850219a929bb3059177174629 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 16 Jan 2024 16:51:49 +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=E6=8E=A5=E5=8F=A3=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=8E=A5=E5=8F=A3=E4=B8=8B=E7=9A=84case=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=81=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=1034124 --user=王孝刚 【接口测试】github#28129，开启接口定义url可重复，将带case的api导出，再导入到其他目录，原api下的case都不见了 https://www.tapd.cn/55049933/s/1451974
---
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 279589b899..d10a71100c 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -1252,7 +1252,7 @@
     </select>
     <select id="selectRepeatByBLOBsSameUrl" resultType="io.metersphere.base.domain.ApiDefinitionWithBLOBs">
         SELECT * from api_definition
-        <include refid="Same_Where_Clause"/>
+        <include refid="Same_Where_Clause_Same" />
         and status != 'TRASH'
         and project_id = #{projectId}
         <if test="moduleId != null">
@@ -1330,6 +1330,31 @@
         </where>
     </sql>
 
+    <sql id="Same_Where_Clause_Same">
+        <where>
+            <if test="blobs">
+                <trim prefix="(" prefixOverrides="and" suffix=")">
+                    <foreach collection="blobs" item="blob" separator="or">
+                        <trim prefix="(" prefixOverrides="and" suffix=")">
+                            <if test="blob.method">
+                                and api_definition.method = #{blob.method}
+                            </if>
+                            <if test="blob.path">
+                                and api_definition.path = #{blob.path}
+                            </if>
+                            <if test="blob.name">
+                                and api_definition.name = #{blob.name}
+                            </if>
+                            <if test="blob.modulePath">
+                                and api_definition.module_path = #{blob.modulePath}
+                            </if>
+                        </trim>
+                    </foreach>
+                </trim>
+            </if>
+        </where>
+    </sql>
+
     <sql id="relevanceApiCombine">
         <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
             and atc.name