From a0738138044d2c640d932479ec497517b3e88a9d Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 30 Oct 2024 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=97=A5=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1048327 --user=宋昌昌 【缺陷管理】缺陷-高级搜索-jira截止日期字段-筛选不到数据 https://www.tapd.cn/55049933/s/1601908
---
 .../java/io/metersphere/system/mapper/BaseMapper.xml  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 657c748572..687c52ef2e 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
@@ -122,6 +122,13 @@
                                 <property name="column" value="value"/>
                             </include>
                         </when>
+                        <when test="condition.customFieldType != null and
+                        (condition.customFieldType == 'DATE' or condition.customFieldType == 'DATETIME')">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="UNIX_TIMESTAMP(`value`) * 1000"/>
+                            </include>
+                        </when>
                         <otherwise>
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
@@ -263,10 +270,10 @@
                     ${column} between #{condition.value[0]} and #{condition.value[1]}
                 </when>
                 <when test="${condition}.operator == 'GT'">
-                    ${column} &gt; #{condition.value}
+                    ${column} is not null and ${column} != '' and ${column} &gt; #{condition.value}
                 </when>
                 <when test="${condition}.operator == 'LT'">
-                    ${column} &lt; #{condition.value}
+                    ${column} is not null and ${column} != '' and ${column} &lt; #{condition.value}
                 </when>
                 <when test="${condition}.operator == 'COUNT_GT'">
                     JSON_LENGTH(${column}) &gt; #{condition.value}