diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml index 5233df3..6dd30e3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml @@ -42,9 +42,12 @@ c.mac mac, c.process process FROM - (select * from cs_ledger where LEVEL = 0 ) a, - (select * from cs_ledger where LEVEL = 1 ) b, - (select * from cs_ledger where LEVEL = 2 ) d, + (select * from cs_ledger where LEVEL = 0 and State =1 + ) a, + (select * from cs_ledger where LEVEL = 1 and State =1 + ) b, + (select * from cs_ledger where LEVEL = 2 and State =1 + ) d, cs_equipment_delivery c WHERE a.LEVEL = 0 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java index df76dfd..ff9c9fd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java @@ -43,7 +43,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl csLinePOList = csLinePOService.queryByDevId(devId); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(collect)){