diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml index 523425cb..e18be413 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml @@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `rescue_info` ri INNER JOIN rescue_driver_info rdi ON ri.id = rdi.rescue_id AND rdi.driver_accept = '2' WHERE + ri.deleted = 0 and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null ORDER BY rdi.create_time desc @@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `rescue_info` ri left join rescue_order_info roi on ri.id = roi.rescue_info_id WHERE + ri.deleted = '0' and ri.driver_id =#{map.driverId} and ri.rescue_status = #{map.rescueStatus} @@ -143,6 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM `rescue_driver_info` rdi INNER JOIN rescue_info ri on rdi.rescue_id = ri.id - where rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null + where rdi.deleted = 0 and rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null