From 3ccf7533e1b5457481bd12a095b1706d45ce6bb3 Mon Sep 17 00:00:00 2001
From: liuyiliang <azc78910>
Date: Wed, 24 Jul 2024 13:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8D=95=E6=9D=A1=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/modules/inspection/mapper/InspectionObjectMapper.xml | 2 +-
 .../energy/modules/inspection/mapper/InspectionRouteMapper.xml  | 2 +-
 .../java/org/energy/modules/spares/mapper/MaterialMapper.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml
index 50df11f..024a11e 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml
+++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml
@@ -67,6 +67,6 @@
     </select>
 
     <select id="getDetailList" resultMap="inspectionObjectResultMap">
-        select object_name, object_type , station from i_inspection_object where object_no = ${object_no}
+        select object_name, object_type , station from i_inspection_object where object_no = ${object_no} and is_deleted = 0
     </select>
 </mapper>
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
index 473c3e7..37e27a6 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
+++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
@@ -55,7 +55,7 @@
     </select>
 
     <select id="getDetailList" resultMap="inspectionRouteResultMap">
-        select route_name, type from i_inspection_route where route_no = #{route_no}
+        select route_name, type from i_inspection_route where route_no = #{route_no} and is_deleted = 0
     </select>
 
 </mapper>
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
index ac128a7..f902586 100644
--- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
@@ -47,7 +47,7 @@
         LEFT JOIN spt_warehouse b ON b.code = a.warehouse
         WHERE
             a.material_no = #{materialNo}
-          AND a.is_deleted = 0
+          AND a.is_deleted = 0 and b.is_deleted = 0
     </select>
 
     <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">