From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
index 01f9758..adafa74 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
@@ -6,7 +6,9 @@
     <resultMap id="gdDeviceCallResultMap" type="org.sxkj.gd.workorder.entity.GdDeviceCallEntity">
         <result column="id" property="id"/>
         <result column="patrol_task_name" property="patrolTaskName"/>
+        <result column="task_department_id" property="taskDepartmentId"/>
         <result column="task_department" property="taskDepartment"/>
+        <result column="task_initiator_id" property="taskInitiatorId"/>
         <result column="task_initiator" property="taskInitiator"/>
         <result column="flight_duration" property="flightDuration"/>
         <result column="flight_distance" property="flightDistance"/>
@@ -31,12 +33,13 @@
             <if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
                 and patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
             </if>
-            <if test="param2.deviceId != null and param2.deviceId != ''">
+            <if test="param2.deviceId != null">
                 and device_id = #{param2.deviceId}
             </if>
             <if test="param2.taskInitiatorId != null and param2.taskInitiatorId != ''">
                 and task_initiator_id = #{param2.taskInitiatorId}
             </if>
+            order by create_time desc
         </where>
     </select>
 

--
Gitblit v1.9.3