From fdd02ce546bc7e312e469e62d3473d9517a8a961 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:22:15 +0800
Subject: [PATCH] 同步获取吉安机巢无人机设备

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 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..ca99d1b 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
@@ -28,6 +28,7 @@
             md.longitude,
             md.latitude,
             md.location,
+            md.device_type,
             bd.dept_name as device_dept_name
         from
             ja_gd_manage_device md
@@ -36,10 +37,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