From c4d10fdd09ce163d82818bd0c51130c2e60dda6f Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 3 Nov 2026 21:16:02 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=90=88=E5=90=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E5=AE=A2?=
 =?UTF-8?q?=E5=95=86=EF=BC=88=E7=94=B2/=E4=B9=99=E6=96=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=89=E6=A8=A1=E7=B3=8A=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/transport/pojo/vo/ContractManageVO.java   | 4 ++++
 .../transport/service/impl/ContractManageServiceImpl.java     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
index 5f76a439..11009240 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
@@ -67,6 +67,10 @@ public class ContractManageVO extends ContractManage {
 	@Schema(description = "生效类型筛选")
 	private String effectiveType;
 
+	@TableField(exist = false)
+	@Schema(description = "客商筛选：按甲方/乙方名称模糊匹配（丙方未落库，不参与）")
+	private String partyName;
+
 	@TableField(exist = false)
 	@Schema(description = "创建人姓名")
 	private String createUserName;
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
index 3d2ac007..5f20782e 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
@@ -619,6 +619,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		queryWrapper.eq(Func.isNotEmpty(contractManage.getProjectId()), ContractManage::getProjectId, contractManage.getProjectId())
 			.like(Func.isNotEmpty(contractManage.getContractNo()), ContractManage::getContractNo, contractManage.getContractNo())
 			.like(Func.isNotEmpty(contractManage.getContractName()), ContractManage::getContractName, contractManage.getContractName())
+			// 客商即签约主体，合同表只存甲/乙方名称串（丙方未落库），命中任一方即返回
+			.and(Func.isNotEmpty(contractManage.getPartyName()), wrapper -> wrapper
+				.like(ContractManage::getPartyA, contractManage.getPartyName())
+				.or().like(ContractManage::getPartyB, contractManage.getPartyName()))
 			.like(Func.isNotEmpty(contractManage.getProjectName()) && Func.isEmpty(contractManage.getProjectId()),
 				ContractManage::getProjectName, contractManage.getProjectName())
 			.like(Func.isNotEmpty(contractManage.getOrganizationName()), ContractManage::getOrganizationName, contractManage.getOrganizationName())