From 4f20a60bd9cbcf3febb29ffcbd39ed93b38ae67e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 19:15:44 +0800
Subject: [PATCH] 应用创新

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 2810e63..2c1f565 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
@@ -27,8 +27,8 @@
                 blade_dept bd on md.create_dept = bd.id
         <where>
                 and md.is_deleted = 0
-            <if test="param2.deviceName != null and param2.deviceName != ''">
-                and md.nickname like concat('%',#{param2.deviceName},'%')
+            <if test="param2.nickname != null and param2.nickname != ''">
+                and md.nickname like concat('%',#{param2.nickname},'%')
             </if>
             <if test="param2.deptId != null">
                 and md.create_dept = #{param2.deptId}
@@ -36,6 +36,13 @@
             <if test="param2.location != null and param2.location != ''">
                 and md.location like concat('%',#{param2.location},'%')
             </if>
+            <if test="param2.modeCode != null and param2.modeCode != ''">
+                and md.mode_code = #{param2.modeCode}
+            </if>
+            <if test="param2.deviceType != null and param2.deviceType != ''">
+                and md.device_type = #{param2.deviceType}
+            </if>
+
         </where>
     </select>
 
@@ -74,6 +81,9 @@
             <if test="geom != null and geom != ''">
                 and ST_Intersects(md.geom, ST_GeomFromText(#{geom}))
             </if>
+            <if test="deviceType != null and deviceType != '' ">
+                and md.device_type = #{deviceType}
+            </if>
                 and md.is_deleted = 0
         </where>
     </select>

--
Gitblit v1.9.3