From 952b735a537ea670ca860fc4a61df20bf351adbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 29 Sep 2026 15:22:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=93=E7=AE=97=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=BC=E5=AE=B9=E9=A2=84=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PaymentApplicationServiceImpl.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index 38802ebe..54ff9c7c 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -176,7 +176,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			.like(Func.isNotEmpty(query.getPayeeName()), PaymentApplication::getPayeeName, query.getPayeeName())
 			.like(Func.isNotEmpty(query.getProjectName()), PaymentApplication::getProjectName, query.getProjectName())
 			.like(Func.isNotEmpty(query.getDeptName()), PaymentApplication::getDeptName, query.getDeptName())
-			.like(Func.isNotEmpty(query.getSettlementNo()), PaymentApplication::getSettlementNo, query.getSettlementNo())
+			// 按结算单号查询时，同时匹配付款申请单号和预付款申请单号
+			.and(Func.isNotEmpty(query.getSettlementNo()), w -> w
+				.like(PaymentApplication::getSettlementNo, query.getSettlementNo())
+				.or()
+				.like(PaymentApplication::getPreSettlementNo, query.getSettlementNo()))
 			.eq(Func.isNotEmpty(query.getPaymentType()), PaymentApplication::getPaymentType, query.getPaymentType())
 			.eq(Func.isNotEmpty(query.getApprovalStatus()), PaymentApplication::getApprovalStatus, query.getApprovalStatus())
 			.eq(Func.isNotEmpty(query.getKingdeeStatus()), PaymentApplication::getKingdeeStatus, query.getKingdeeStatus())