From 56990758456474e460c286838b8aa96b27277dcb Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Thu, 19 Sep 2024 11:05:24 +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=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046674 --user=陈建星 【用例评审】评审详情-高级筛选-自动定义字段整数类型+输入框类型筛选失败 https://www.tapd.cn/55049933/s/1580542
---
 .../metersphere/system/mapper/BaseMapper.xml  | 78 +++++++++----------
 1 file changed, 38 insertions(+), 40 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 a65c5091d9..32cb364210 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
@@ -72,14 +72,42 @@
 
         <if test="${combineSearch}.customFiledNoneConditions.size() > 0">
             <foreach collection="${combineSearch}.customFiledNoneConditions" item="condition">
-                ${mainIdColumn} not in (
-                    select ${associationIdColumn} from  ${associationTable} where
-                    field_id = #{condition.name} and
-                    `value` is not null and `value` != ''
-                    <if test="condition.customFieldType != null and condition.isMultipleCustomField()">
-                        and `value` != '[]'
-                    </if>
-                ) or
+                <trim prefix="(" suffix=")">
+                    ${mainIdColumn} not in (
+                        select ${associationIdColumn} from  ${associationTable} where
+                        field_id = #{condition.name} and
+                        `value` is not null and `value` != ''
+                        <if test="condition.customFieldType != null and condition.isMultipleCustomField()">
+                            and `value` != '[]'
+                        </if>
+                    ) or
+                    ${mainIdColumn} in (
+                        select ${associationIdColumn} from ${associationTable} where
+                        field_id = #{condition.name} and
+                        <choose>
+                            <when test="condition.customFieldType != null and condition.isMultipleCustomField()">
+                                <include refid="io.metersphere.system.mapper.BaseMapper.arrayValueCondition">
+                                    <property name="condition" value="condition"/>
+                                    <property name="column" value="value"/>
+                                </include>
+                            </when>
+                            <otherwise>
+                                <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                    <property name="condition" value="condition"/>
+                                    <property name="column" value="value"/>
+                                </include>
+                            </otherwise>
+                        </choose>
+                    )
+                </trim>
+                <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                    <property name="searchMode" value="${combineSearch}.searchMode"/>
+                </include>
+            </foreach>
+        </if>
+
+        <if test="${combineSearch}.customFiledConditions.size() > 0">
+            <foreach collection="${combineSearch}.customFiledConditions" item="condition">
                 ${mainIdColumn} in (
                     select ${associationIdColumn} from ${associationTable} where
                     field_id = #{condition.name} and
@@ -103,36 +131,6 @@
                 </include>
             </foreach>
         </if>
-
-        <if test="${combineSearch}.customFiledConditions.size() > 0">
-            ${mainIdColumn} in (
-                select ${associationIdColumn} from ${associationTable} where
-                <trim suffixOverrides="AND|OR">
-                    <foreach collection="${combineSearch}.customFiledConditions" item="condition">
-                        <trim prefix="(" suffix=")">
-                            field_id = #{condition.name} and
-                            <choose>
-                                <when test="condition.customFieldType != null and condition.isMultipleCustomField()">
-                                    <include refid="io.metersphere.system.mapper.BaseMapper.arrayValueCondition">
-                                        <property name="condition" value="condition"/>
-                                        <property name="column" value="value"/>
-                                    </include>
-                                </when>
-                                <otherwise>
-                                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                        <property name="condition" value="condition"/>
-                                        <property name="column" value="value"/>
-                                    </include>
-                                </otherwise>
-                            </choose>
-                        </trim>
-                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                            <property name="searchMode" value="${combineSearch}.searchMode"/>
-                        </include>
-                    </foreach>
-                </trim>
-            )
-        </if>
     </sql>
 
     <sql id="arrayValueCondition">
@@ -151,13 +149,13 @@
                 <when test="${condition}.operator == 'NOT_CONTAINS'">
                     ${column} is null or ${column} = '[]' or
                     <foreach collection="${condition}.value" item="tag" separator="and" open="(" close=")">
-                        !JSON_CONTAINS(${column}, JSON_ARRAY(#{tag}))
+                        not JSON_CONTAINS(${column}, JSON_ARRAY(#{tag}))
                     </foreach>
                 </when>
                 <when test="${condition}.operator == 'NOT_IN'">
                     ${column} is null or ${column} = '[]' or
                     <foreach collection="${condition}.value" item="tag" separator="and" open="(" close=")">
-                        !JSON_CONTAINS(${column}, JSON_ARRAY(#{tag}))
+                        not JSON_CONTAINS(${column}, JSON_ARRAY(#{tag}))
                     </foreach>
                 </when>
                 <when test="${condition}.operator == 'COUNT_GT'">