From 3dfbbe2bc5eb3e98311dd0c828ff04f433aca9a6 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Sat, 31 Jan 2026 15:30:09 +0800
Subject: [PATCH] 星图任务推送优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
index 6e1b1f4..41e78b1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -19,15 +19,7 @@
 
     <select id="selectGdManageDevicePage" resultMap="gdManageDeviceResultMap">
         select
-            md.id,
-            md.device_sn,
-            md.device_name,
-            md.nickname,
-            md.mode_code,
-            md.device_payload,
-            md.longitude,
-            md.latitude,
-            md.location,
+            md.*,
             bd.dept_name as device_dept_name
         from
             ja_gd_manage_device md
@@ -36,10 +28,7 @@
         <where>
                 and md.is_deleted = 0
             <if test="param2.deviceName != null and param2.deviceName != ''">
-                and md.device_name like concat('%',#{param2.deviceName},'%')
-            </if>
-            <if test="param2.nickname != null and param2.nickname != ''">
-                and md.nickname like concat('%',#{param2.nickname},'%')
+                and md.nickname like concat('%',#{param2.deviceName},'%')
             </if>
             <if test="param2.deptId != null">
                 and md.create_dept = #{param2.deptId}

--
Gitblit v1.9.3