From 30c12a8796d4b4f9cfeef6f9b37731e50c211a1d Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 23 Sep 2024 15:20:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86=E5=A4=9A=E4=B8=AA=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=97=B6=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E6=9D=A1=E4=BB=B6=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=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=1046945 --user=陈建星 【高级搜索】用例列表筛选，用例关联多个需求时，条件：关联需求 不包含/不等于 关键字 查询到的结果错误 https://www.tapd.cn/55049933/s/1583718
---
 .../metersphere/system/mapper/BaseMapper.xml  | 55 +++++++++++++++----
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
index e650684ecc..32a8963a9e 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
@@ -185,18 +185,26 @@
             </when>
             <otherwise>
                 (
+                    ${mainIdColumn}
                     <if test="${condition}.operator == 'NOT_IN' or ${condition}.operator == 'NOT_EQUALS' or ${condition}.operator == 'NOT_CONTAINS'">
-                        ${mainIdColumn} not in (
-                            select ${associationIdColumn} from  ${associationTable} where
-                            ${searchColumn} is not null and ${searchColumn} != ''
-                        ) or
+                       not
                     </if>
-                    ${mainIdColumn} in (
-                    select ${associationIdColumn} from  ${associationTable} where
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="condition" value="${condition}"/>
-                        <property name="column" value="${searchColumn}"/>
-                    </include>
+                    in (
+                        select ${associationIdColumn} from  ${associationTable} where
+                        <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="${searchColumn}"/>
+                                </include>
+                            </when>
+                            <otherwise>
+                                <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                    <property name="condition" value="${condition}"/>
+                                    <property name="column" value="${searchColumn}"/>
+                                </include>
+                            </otherwise>
+                        </choose>
                     )
                 )
             </otherwise>
@@ -274,6 +282,33 @@
         </trim>
     </sql>
 
+    <sql id="associationReversalCondition">
+        <trim prefix="(" suffix=")">
+            <choose>
+                <when test="${condition}.operator == 'NOT_CONTAINS'">
+                    <foreach collection="${condition}.value.split(' ')" item="item" separator="and">
+                        ${column} like CONCAT('%', #{item},'%')
+                    </foreach>
+                </when>
+                <when test="${condition}.operator == 'NOT_IN'">
+                    <if test="'${column}' == 'value'">
+                        `value`
+                    </if>
+                    <if test="'${column}' != 'value'">
+                        ${column}
+                    </if>
+                    in
+                    <foreach collection="${condition}.value" item="v" separator="," open="(" close=")">
+                        #{v}
+                    </foreach>
+                </when>
+                <when test=" ${condition}.operator == 'NOT_EQUALS'">
+                    ${column} = #{condition.value}
+                </when>
+            </choose>
+        </trim>
+    </sql>
+
     <sql id="queryType">
         <choose>
             <when test="${searchMode} == 'AND'">