select w.*,r.direction from product_voyage w inner join resource_route r on w.route_id = r.id
select w.*,r.direction from product_voyage w inner join resource_route r on w.route_id = r.id
- where w.ship_id = #{shipId} and w.start_time > now() and w.shelf_status = 1 and w.channel like '%1%' order by w.create_time asc;
+ where w.deleted = 0 and r.deleted = 0 and w.ship_id = #{shipId} and w.start_time > now() and w.shelf_status = 1 and w.channel like '%1%' order by w.create_time asc;