From d7582bc431bc3c407207c808d520b4dcbd79b3b7 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Wed, 25 Oct 2023 19:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapping/CsEquipmentDeliveryMapper.xml         | 9 ++++++---
 .../service/impl/AppLineTopologyDiagramServiceImpl.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

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<AppLineTopolo
     private final ICsLedgerService iCsLedgerService;
     @Override
     public AppTopologyDiagramVO query(String devId) {
-        CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).one();
+        CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).eq(CsLedger::getState,1).one();
         List<CsLinePO> csLinePOList = csLinePOService.queryByDevId(devId);
         List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
         if(CollectionUtil.isEmpty(collect)){