diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 0d75ee14e9..54f5c94c5f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -312,13 +312,13 @@ select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey from bus_sales_order_vehicle bv LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid - where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} + where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} and length(bv.linkNo)>0 union all select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey from bus_sales_order_vehicle bv LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid - where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 0 + where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 0 and length(bv.linkNo)>0 order by temporaryNo asc