|
|
@@ -52,7 +52,7 @@
|
|
|
) t2 ON pv.id = t2.voyage_id
|
|
|
where rr.deleted = 0 and rd.deleted = 0 and rp.deleted = 0 and pv.deleted = 0 and rs.deleted = 0
|
|
|
GROUP BY
|
|
|
- rs.id
|
|
|
+ rr.id, rs.id
|
|
|
) t3 where 1=1 and t3.price is not null
|
|
|
<if test="reqVo.shipId != null">
|
|
|
and t3.ship_id = #{reqVo.shipId}
|