From c76a3b1194f320bf84061676d14200f7e78f044e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 26ef5f8..b70a04b 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -98,6 +98,9 @@
<if test="c.customerName != null and c.customerName !=''">
AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
</if>
+ <if test="c.invoiceLedgerId != null">
+ AND T1.id = #{c.invoiceLedgerId}
+ </if>
<if test="c.customerContractNo != null and c.customerContractNo !=''">
AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
</if>
@@ -180,6 +183,7 @@
<select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
SELECT
+ T1.id,
T1.receipt_payment_date,
T5.customer_name,
T1.receipt_payment_amount,
--
Gitblit v1.9.3