|
@@ -788,18 +788,29 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
|
|
|
|
@Override
|
|
|
public List<SbInfoVO> getChildSbByIds(List<String> ids) {
|
|
|
+ Map<String,String> maps = new HashMap<>();
|
|
|
+ ids.forEach(item -> maps.put(item,item));
|
|
|
SbInfoDTO queryDTO = new SbInfoDTO();
|
|
|
queryDTO.setIds(ids);
|
|
|
List<SbInfoVO> list = mapper.selectVOList(queryDTO);
|
|
|
+ List<SbInfoVO> resultList = ListUtils.newArrayList();
|
|
|
if(list != null && list.size() > 0){
|
|
|
list.forEach(item -> {
|
|
|
- // 获取子设备
|
|
|
- SbInfoDTO query = new SbInfoDTO();
|
|
|
- query.setParentId(item.getId());
|
|
|
- item.setChildren(mapper.selectVOList(query));
|
|
|
+ // 子设备且父设备在maps中不添加
|
|
|
+ if(item.getIsChild() == 1){
|
|
|
+ if(StringUtils.isBlank(maps.get(item.getParentId()))){
|
|
|
+ resultList.add(item);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ // 获取子设备
|
|
|
+ SbInfoDTO query = new SbInfoDTO();
|
|
|
+ query.setParentId(item.getId());
|
|
|
+ item.setChildren(mapper.selectVOList(query));
|
|
|
+ resultList.add(item);
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
- return list;
|
|
|
+ return resultList;
|
|
|
}
|
|
|
|
|
|
/**
|