Commit 639e0bab11332b6877b93c0e1a6bc824df2db158
1 parent
fec69c71
修复树形列表通道查询
Showing
1 changed file
with
2 additions
and
3 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
| 1 | package com.genersoft.iot.vmp.service.impl; | 1 | package com.genersoft.iot.vmp.service.impl; |
| 2 | 2 | ||
| 3 | -import com.genersoft.iot.vmp.common.InviteSessionType; | ||
| 4 | import com.genersoft.iot.vmp.common.VideoManagerConstants; | 3 | import com.genersoft.iot.vmp.common.VideoManagerConstants; |
| 5 | import com.genersoft.iot.vmp.conf.DynamicTask; | 4 | import com.genersoft.iot.vmp.conf.DynamicTask; |
| 6 | import com.genersoft.iot.vmp.conf.UserSetting; | 5 | import com.genersoft.iot.vmp.conf.UserSetting; |
| @@ -390,8 +389,8 @@ public class DeviceServiceImpl implements IDeviceService { | @@ -390,8 +389,8 @@ public class DeviceServiceImpl implements IDeviceService { | ||
| 390 | if (device == null) { | 389 | if (device == null) { |
| 391 | return null; | 390 | return null; |
| 392 | } | 391 | } |
| 393 | - if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) { | ||
| 394 | - parentId = null; | 392 | + if (ObjectUtils.isEmpty(parentId) ) { |
| 393 | + parentId = deviceId; | ||
| 395 | } | 394 | } |
| 396 | List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog); | 395 | List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog); |
| 397 | return transportChannelsToTree(rootNodes, ""); | 396 | return transportChannelsToTree(rootNodes, ""); |