From e036fe7e10b1814adc21fda1d995941767d2bfd0 Mon Sep 17 00:00:00 2001
From: "UNISINSIGHT\\rdpnr_jiangpeng" <Cq258258>
Date: Fri, 3 Apr 2026 10:28:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/sip/ProjectInfoMapper.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index 45bdb342..14e92450 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -204,13 +204,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastWorkUpdateTimeStart != null or lastWorkUpdateTimeEnd != null">
                 <choose>
                     <when test="lastWorkUpdateTimeStart != null and lastWorkUpdateTimeEnd != null">
-                        and t4.work_time between date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59')
+                        and ifnull(t4.work_time,t1.update_time) between date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59')
                     </when>
                     <when test="lastWorkUpdateTimeStart != null">
-                        and t4.work_time <![CDATA[ >= ]]>  date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00')
+                        and ifnull(t4.work_time,t1.update_time) <![CDATA[ >= ]]>  date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00')
                     </when>
                     <when test="lastWorkUpdateTimeEnd != null">
-                        and t4.work_time <![CDATA[ <= ]]> date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59')
+                        and ifnull(t4.work_time,t1.update_time) <![CDATA[ <= ]]> date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59')
                     </when>
 
                 </choose>