diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
index 7647a166e..35aa397f0 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
@@ -145,7 +145,7 @@ public class EmisSettleSubBillController extends EmisBaseController
     {
         setPrivParams(emisSettleSubBill);
 
-        if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
+        if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
             emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode()));
             String[] billCodeSortList = emisSettleSubBill.getBillCode().split(",");
             if(billCodeSortList.length>1){
@@ -440,6 +440,13 @@ public class EmisSettleSubBillController extends EmisBaseController
                         return AjaxResult.error("账单不存在:"+old.getBillCode());
                     }
 
+                    EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo());
+                    if(waybill==null){
+                        return AjaxResult.error("运单不存在:"+old.getBillCode());
+                    }
+                    if ("6".equals(waybill.getPaymentType())) {
+                        return AjaxResult.error(old.getBillCode() + "支付方式是其他,不允许确认账单，请修改正确的支付方式");
+                    }
                     if(!"0086".equals(old.getWaybillDetail().getSendCountry()) && "0086".equals(old.getWaybillDetail().getReceiveCountry())
                             && (
                                     "2".equals(old.getWaybillDetail().getPaymentType())
@@ -467,7 +474,6 @@ public class EmisSettleSubBillController extends EmisBaseController
                         bug:1688
                         调整为现金保留自动确认,月结调整为不自动确认
                      */
-                    EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo());
                     if (waybill.getRealFee() == null) {
                         continue;
                     }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index 22dccb541..4a9f35d46 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -191,7 +191,7 @@
 
                 and EXISTS(
                 select 1 from emis_settle_invoice_rel rel
-                where rel.del_flag = '0' and rel.bill_no=#{params.billCode}
+                where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode})
                 and rel.apply_seq_no = a.apply_seq_no
                 )
 
@@ -350,7 +350,7 @@
             <if test="params.billCode != null and params.billCode != ''">
                 and EXISTS(
                 select 1 from emis_settle_invoice_rel rel
-                where rel.del_flag = '0' and rel.bill_no=#{params.billCode}
+                where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode})
                 and rel.apply_seq_no = a.apply_seq_no
                 )
             </if>