diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index a5943b119..9516451db 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1089,7 +1089,7 @@ and send_town=#{sendTown} and send_address like concat('%', #{sendAddress}, '%') and send_postcode like concat('%', #{sendPostcode}, '%') - and payment_type=#{paymentType} + and FIND_IN_SET(payment_type,#{paymentType}) and calc_fee_type=#{calcFeeType} and cust_no like concat('%', #{custNo}, '%') and cust_name like concat('%', #{custName}, '%') diff --git a/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx b/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx index 39205b2d3..80bf73e6e 100644 Binary files a/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx and b/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx differ