diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml index f080444f0..a79a04232 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml @@ -57,7 +57,7 @@ b.update_time, b.remark,a.bill_code,a.order_sn from emis_waybill a,emis_waybill_cargo b - a.del_flag='0' and b.del_flag='0' and a.waybill_id=b.id and a.order_type='0' + a.del_flag='0' and b.del_flag='0' and b.waybill_id=a.id and a.order_type='0' and ( FIND_IN_SET(b.`order_sn`,#{orderSn}) or b.order_sn like concat('%', #{orderSn}, '%') ) and ( FIND_IN_SET(b.`bill_code`,#{billCode}) or b.bill_code like concat('%', #{billCode}, '%') )