diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 48de7bc66..3b8d96ec0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -589,11 +589,12 @@ COALESCE(COUNT(*), 0) FROM logpm_distribution_signfor lds - JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id AND lddl.is_deleted = 0 + JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.is_deleted = 0 AND ldr.reservation_status != 40 - lds.is_deleted = 0 and lds.driver_signing ='1' and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND - lds.signing_status = '1' + lds.is_deleted = 0 + and lds.driver_signing ='1' + AND lds.signing_status = '1' and ldr.mall_name like concat('%',#{param.mallName},'%')