Merge remote-tracking branch 'origin/main'

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>

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>

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">