From 8333f7b404e713f66b7a3b48f2b6ef7e889a887e Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 31 Mar 2023 18:29:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=9E=E4=BA=8E=E4=B8=8D=E5=8C=85=E5=90=AB=E7=AD=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2SQL=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025019 --user=宋昌昌 【测试跟踪】github#23303，筛选自定义字段不属于条件不生效 https://www.tapd.cn/55049933/s/1358326
---
 .../base/mapper/ext/ExtBaseMapper.xml         | 35 +++++++++++++++++++
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 13 ++++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtBaseMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtBaseMapper.xml
index 4476e65484..ba4b7da806 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtBaseMapper.xml
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtBaseMapper.xml
@@ -22,6 +22,41 @@
         </if>
     </sql>
 
+    <sql id="includeCondition">
+        <choose>
+            <when test='${object}.operator == "like" or ${object}.operator == "not like"'>
+                like CONCAT('%', #{${object}.value},'%')
+            </when>
+            <when test='${object}.operator == "in" or ${object}.operator == "not in"'>
+                in
+                <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
+                    #{v}
+                </foreach>
+            </when>
+            <when test='${object}.operator == "between"'>
+                between #{${object}.value[0]} and #{${object}.value[1]}
+            </when>
+            <when test='${object}.operator == "gt"'>
+                &gt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "lt"'>
+                &lt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "ge"'>
+                &gt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "le"'>
+                &lt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "current user"'>
+                = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}'
+            </when>
+            <otherwise>
+                = #{${object}.value}
+            </otherwise>
+        </choose>
+    </sql>
+
     <sql id="condition">
         <choose>
             <when test='${object}.operator == "like"'>
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 007c129b2f..e6cfb062a9 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -133,7 +133,12 @@
         </if>
         <if test="${condition}.customs != null and ${condition}.customs.size() > 0">
             <foreach collection="${condition}.customs" item="custom" separator="" open="" close="">
-                and test_case.id in (
+                <if test='custom.operator == "not like" or custom.operator == "not in"'>
+                    and test_case.id not in (
+                </if>
+                <if test='custom.operator != "not like" and custom.operator != "not in"'>
+                    and test_case.id in (
+                </if>
                     select resource_id from custom_field_test_case where field_id = #{custom.id}
                     <choose>
                         <when test="custom.type == 'multipleMember' or custom.type == 'checkbox' or custom.type == 'multipleSelect'">
@@ -141,19 +146,19 @@
                         </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">
+                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.includeCondition">
                                 <property name="object" value="custom"/>
                             </include>
                         </when>
                         <when test="custom.type == 'richText' or custom.type == 'textarea'">
                             and text_value
-                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
+                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.includeCondition">
                                 <property name="object" value="custom"/>
                             </include>
                         </when>
                         <otherwise>
                             and trim(both '"' from value)
-                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
+                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.includeCondition">
                                 <property name="object" value="custom"/>
                             </include>
                         </otherwise>