配送取消修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1280,6 +1280,9 @@
 
     </select>
     <select id="selectReservationByDeliveryId">
-        SELECT ldr.* FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId} AND ldr.reservation_status != 40
+        SELECT ldr.* FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId}
+        AND ldr.reservation_status != 40
+        AND ldr.is_deleted = 0
+        AND lds.is_ deleted = 0
     </select>
 </mapper>