From 7de1396e315896dbc72a9d54e44f77434ea90f18 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 14 十二月 2025 23:47:34 +0800
Subject: [PATCH] feat:增加企业微信自动登录

---
 ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
index 1b5cfbb..18aa0a0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
@@ -188,14 +188,13 @@
 
     <select id="selectTaskByVehicleIdAndDate" resultMap="SysTaskResult">
         select tv.task_id, t.actual_start_time,
-        IFNULL(t.actual_end_time, NOW()) as t.actual_end_time
+        IFNULL(t.actual_end_time, NOW()) as actual_end_time
         from sys_task_vehicle tv
         inner join sys_task t on tv.task_id = t.task_id
         where tv.vehicle_id = #{vehicleId}
         and t.del_flag = '0'
         and (
-        (t.actual_end_time is not null and t.actual_start_time > #{startTime} and t.actual_end_time &lt; #{endTime} )
-        or (t.actual_end_time is null and t.actual_start_time > ${endTime} )
+        (t.actual_start_time &lt;= #{endTime} and (t.actual_end_time is null or t.actual_end_time &gt;= #{startTime}))
         )
         order by t.actual_start_time
     </select>

--
Gitblit v1.9.1