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/GdManageDeviceMapper.xml | 5 +----
1 files changed, 1 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 0ea54fd..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
@@ -37,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