From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
index 08e16e4..c7f33c8 100644
--- a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
@@ -36,11 +36,15 @@
<where>
cpp.delete_flag = 0
<if test="c.customerName != null and c.customerName != ''">
- and c.customer_name like concat('%', #{c.customerName}, '%')
+ and (c.customer_name like concat('%', #{c.customerName}, '%') or cp.customer_name like concat('%', #{c.customerName}, '%'))
+ </if>
+ <if test="c.customerType != null">
+ and c.customer_type = #{c.customerType}
</if>
<if test="c.boundId != null">
and cpp.bound_id = #{c.boundId}
</if>
+
</where>
order by cpp.id desc
</select>
--
Gitblit v1.9.3