diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
index d8d1b1cf4..f12d598e2 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
@@ -62,6 +62,7 @@
#{item}
+ order by sub.sort asc
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
index b0c08a5e8..3d59ca347 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
@@ -381,7 +381,7 @@
line.LEVEL,
line.sort,
line.pids,
- CONCAT(voltage.name, '_', line.name) name,
+ CONCAT(voltage.name, '_', line.name, '(',device.`Name`,')') name,
comFlag.Com_Flag,
detail.pt_type,
detail.obj_id
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 57bc5e404..cf4a65df8 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,9 +150,8 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl subList = lineIntegrityDataMapper.getSubList(lineIds);
- subList.sort(Comparator.comparingInt(LineIntegrityDataVO::getSort));
-
List gdIds = subList.stream().map(LineIntegrityDataVO::getPid).distinct().collect(Collectors.toList());
+
// 通过供电公司索引查询供电公司信息
List gdList = lineIntegrityDataMapper.getGdList(gdIds);