fffxiang
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
|
|
@ -314,9 +314,9 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { |
|
|
PageHelper.startPage(page, count); |
|
|
PageHelper.startPage(page, count); |
|
|
List<DeviceChannel> all; |
|
|
List<DeviceChannel> all; |
|
|
if (catalogUnderDevice != null && catalogUnderDevice) { |
|
|
if (catalogUnderDevice != null && catalogUnderDevice) { |
|
|
all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); |
|
|
|
|
|
}else { |
|
|
|
|
|
all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); |
|
|
all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); |
|
|
|
|
|
}else { |
|
|
|
|
|
all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); |
|
|
} |
|
|
} |
|
|
return new PageInfo<>(all); |
|
|
return new PageInfo<>(all); |
|
|
} |
|
|
} |
|
|
|
