guzijian / wvp-GB28181-pro · Commits

Commit 32f1a0aa6e08c74df736604ec0f39d090072dde2

Authored by 648540858
Committed by GitHub
2 parents e8411bc7 76205273

Merge pull request #1094 from lunasaw/wvp-dev-0928 

fix hasSubChannel
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 @32f1a0a
... ... @@ -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" +
... ...