|
@@ -303,7 +303,13 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
|
// 2.2 根据空间id查询建筑id
|
|
|
// 2.3 根据设备id查询建筑id
|
|
|
// 2.4 根据系统id查询建筑id
|
|
|
- Set<String> objIds = pageResult.stream().map(ObjectDigital::getId).collect(Collectors.toSet());
|
|
|
+ Set<String> objIds = pageResult.stream()
|
|
|
+ .filter(object->!DigitalObjectType.BUILDING.getIndex().equals(object.getObjType()))
|
|
|
+ .map(ObjectDigital::getId)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
+ if (CollUtil.isEmpty(objIds)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
List<ObjectDigital> objectDigitals = objectRelationMapper.selectRelCodesByObjIdsAndRelCodes(objIds, CollUtil
|
|
|
.newHashSet(DigitalRelCode.EQ_2_EC.getIndex(), DigitalRelCode.BD_2_FL.getIndex(),
|
|
|
DigitalRelCode.BD_2_SP.getIndex(), DigitalRelCode.SY_2_BD.getIndex(),
|