From 57c136a4d732b78f2fd3c0eb18f3941118d0fefd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:08:56 +0800
Subject: [PATCH] 设备id类型

---
 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