guzijian / wvp-GB28181-pro · Commits

Commit 94a0de0d275ec30feac3aadc8d41db042aa18c6d

Authored by 648540858
2 parents 130dc5d8 32f1a0aa

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
  View file @94a0de0
... ... @@ -167,8 +167,8 @@ public interface DeviceChannelMapper {
167 167 " <if test='query != null'> AND (dc.channel_id LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%'))</if> " +
168 168 " <if test='online == true' > AND dc.status=true</if> " +
169 169 " <if test='online == false' > AND dc.status=false</if> " +
170   - " <if test='hasSubChannel!= null and has_sub_channel == true' > AND dc.sub_count > 0</if> " +
171   - " <if test='hasSubChannel!= null and has_sub_channel == false' > AND dc.sub_count = 0</if> " +
  170 + " <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc.sub_count > 0</if> " +
  171 + " <if test='hasSubChannel!= null and hasSubChannel == false' > AND dc.sub_count = 0</if> " +
172 172 " <if test='catalogId == null ' > AND dc.id not in (select device_channel_id from wvp_platform_gb_channel where platform_id=#{platformId} ) </if> " +
173 173 " <if test='catalogId != null ' > AND pgc.platform_id = #{platformId} and pgc.catalog_id=#{catalogId} </if> " +
174 174 " ORDER BY dc.device_id, dc.channel_id ASC" +
... ...