From 351a02ee93e18da5cdc99b40ee3be1c7d8c7b5ad Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 4 Dec 2024 11:39:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1037138 --user=宋昌昌 【测试跟踪】github#29458，【缺陷管理】【高级搜索】高级搜索不属于某条件时查询出来出来的都是属于该条件的 https://www.tapd.cn/55049933/s/1624407
---
 .../base/mapper/ext/ExtIssuesMapper.xml       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 3e4696dfea..cb3bfdfde0 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -395,12 +395,26 @@
         </if>
         <if test="${condition}.customs != null and ${condition}.customs.size() > 0">
             <foreach collection="${condition}.customs" item="custom" separator="" open="" close="">
-                and issues.id in (
+                <!-- 多选字段查询条件已经拼接好 -->
+                <if test="custom.type == 'multipleMember' or custom.type == 'checkbox' or custom.type == 'multipleSelect'">
+                    and issues.id
+                    <choose>
+                        <when test='custom.operator == "in"'>
+                            in
+                        </when>
+                        <when test='custom.operator == "not in"'>
+                            not in
+                        </when>
+                        <otherwise>
+                            in
+                        </otherwise>
+                    </choose>
+                    (select resource_id from custom_field_issues where field_id = #{custom.id} and ${custom.value})
+                </if>
+                <if test="custom.type != 'multipleMember' and custom.type != 'checkbox' and custom.type != 'multipleSelect'">
+                    and issues.id in (
                     select resource_id from custom_field_issues where field_id = #{custom.id}
                     <choose>
-                        <when test="custom.type == 'multipleMember' or custom.type == 'checkbox' or custom.type == 'multipleSelect'">
-                            and ${custom.value}
-                        </when>
                         <when test="custom.type == 'date' or custom.type == 'datetime'">
                             and left(replace(unix_timestamp(trim(both '"' from `value`)), '.', ''), 13)
                             <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
@@ -420,7 +434,8 @@
                             </include>
                         </otherwise>
                     </choose>
-                )
+                    )
+                </if>
             </foreach>
         </if>
     </sql>