diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java index cf4a65df8..57bc5e404 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java @@ -150,8 +150,9 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl subList = lineIntegrityDataMapper.getSubList(lineIds); - List gdIds = subList.stream().map(LineIntegrityDataVO::getPid).distinct().collect(Collectors.toList()); + subList.sort(Comparator.comparingInt(LineIntegrityDataVO::getSort)); + List gdIds = subList.stream().map(LineIntegrityDataVO::getPid).distinct().collect(Collectors.toList()); // 通过供电公司索引查询供电公司信息 List gdList = lineIntegrityDataMapper.getGdList(gdIds);