From 47034570bffe65bfe1ab642442f8261616ed42f8 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Thu, 26 Sep 2024 14:10:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=B3=E8=81=94=E7=9A=84=E9=99=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B8=A6=E5=90=8E=E7=BC=80=E7=9A=84=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046954 --user=陈建星 【高级搜索】用例列表使用关联附件条件筛选，无法比较关联文件，只能比较本地上传的文件 https://www.tapd.cn/55049933/s/1586779
---
 .../mapper/ExtFunctionalCaseMapper.xml        | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index 5b030e0ca4..5421c85d9b 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -368,8 +368,12 @@
 
     <sql id="associationAttachmentCondition">
         <choose>
-            <when test="${condition}.operator == 'EMPTY'">
-                functional_case.id not in (
+            <when test="${condition}.operator == 'EMPTY' or ${condition}.operator == 'NOT_EMPTY'">
+                functional_case.id
+                <if test="${condition}.operator == 'EMPTY'">
+                    not
+                </if>
+                in (
                     select file_association.source_id from file_association where file_association.source_type = 'FUNCTIONAL_CASE'
                 )
             </when>
@@ -382,20 +386,32 @@
                 in (
                     select file_association.source_id from file_association join file_metadata on file_association.file_id = file_metadata.id
                     and file_association.source_type = 'FUNCTIONAL_CASE' and
-                    <choose>
-                        <when test="${condition}.operator == 'NOT_IN' or ${condition}.operator == 'NOT_EQUALS' or ${condition}.operator == 'NOT_CONTAINS'">
-                            <include refid="io.metersphere.system.mapper.BaseMapper.associationReversalCondition">
-                                <property name="condition" value="${condition}"/>
-                                <property name="column" value="file_metadata.original_name"/>
-                            </include>
-                        </when>
-                        <otherwise>
-                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                <property name="condition" value="${condition}"/>
-                                <property name="column" value="file_metadata.original_name"/>
-                            </include>
-                        </otherwise>
-                    </choose>
+                    <trim prefix="(" suffix=")">
+                        <choose>
+                            <when test="${condition}.operator == 'CONTAINS' or ${condition}.operator == 'NOT_CONTAINS'">
+                                <foreach collection="${condition}.value.split(' ')" item="item" separator="and">
+                                    <foreach collection="item.split('\\.')" index="index" item="subItem">
+                                        <if test="index == 0">
+                                            file_metadata.name like CONCAT('%', #{subItem},'%')
+                                        </if>
+                                        <if test="index == 1">
+                                            and file_metadata.`type` like CONCAT('%', #{subItem},'%')
+                                        </if>
+                                    </foreach>
+                                </foreach>
+                            </when>
+                            <when test="${condition}.operator == 'EQUALS' or ${condition}.operator == 'NOT_EQUALS'">
+                                <foreach collection="${condition}.value.split('\\.')" index="index" item="item">
+                                    <if test="index == 0">
+                                        file_metadata.name = #{item}
+                                    </if>
+                                    <if test="index == 1">
+                                        and file_metadata.`type` = #{item}
+                                    </if>
+                                </foreach>
+                            </when>
+                        </choose>
+                    </trim>
                     )
                 )
             </otherwise>