From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index 3356754..941041a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -32,7 +32,7 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
select
pt.*,
- md.nickname as deviceName,
+ md.nickname as device_name,
wo.work_order_name,
IFNULL(tr.result_count, 0) as result_count,
IFNULL(tr.issue_event_count, 0) as issue_event_count
@@ -67,9 +67,9 @@
<if test="param2.taskStatus != null and param2.taskStatus != ''">
and pt.task_status = #{param2.taskStatus}
</if>
- <if test="param3 != null and param3.size > 0">
+ <if test="param2.deptList != null and param2.deptList.size > 0">
and pt.create_dept in
- <foreach collection="param3" item="deptId" open="(" separator="," close=")">
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
--
Gitblit v1.9.3