From 654599b6598d050e55522beffcdfd8eaccbefd12 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 19 Jan 2024 16:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E9=81=93=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=90=8E=E6=97=A0=E6=B3=95=E8=A2=AB=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index 608bc277..07597086 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -107,7 +107,11 @@ public interface DeviceChannelMapper { "wvp_device_channel dc " + "WHERE " + "dc.device_id = #{deviceId} " + -" AND (dc.channel_id LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%')) " + + " AND (" + + "dc.channel_id LIKE concat('%',#{query},'%') " + + "OR dc.name LIKE concat('%',#{query},'%') " + + "OR dc.custom_name LIKE concat('%',#{query},'%')" + + ") " + " AND (dc.parent_id=#{parentChannelId} OR dc.civil_code = #{parentChannelId}) " + " AND dc.status= true" + " AND dc.status= false" +