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