Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

6 天以前 67031ba3128a445cede7253ab9e0a50885ba0382

Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

 src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml

@@ -89,7 +89,7 @@
    <select id="existsByStockInRecordId" resultType="java.lang.Boolean">
         SELECT COUNT(*) > 0
        FROM account_payment_application
        WHERE
        WHERE  status != 2
        <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
            FIND_IN_SET(#{id}, stock_in_record_ids)
        </foreach>

 src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml

@@ -64,7 +64,7 @@
    <select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
        SELECT COUNT(*) > 0
        FROM account_invoice_application
        WHERE
        WHERE status!=2
        <foreach collection="stockOutRecordIds" item="id" open="(" separator=" OR " close=")">
            FIND_IN_SET(#{id}, stock_out_record_ids)
        </foreach>