From c5a7491f7b074682adb70b7a4125616cd1f8689b Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 2 Apr 2025 16:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=B6=E7=9B=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/revenuereward/RevenueRewardViewMapper.xml       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
index e9d78cc..4a9724d 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
@@ -91,7 +91,8 @@
             and darrr.trade_scene = #{queryParams.tradeScene}
         </if>
         <if test="queryParams.revenueOwnerName != null and queryParams.revenueOwnerName != '' ">
-            AND dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')
+            AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')
+            dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%'))
         </if>
         <if test="queryParams.revenueOwnerPhone != null and queryParams.revenueOwnerPhone != '' ">
             AND dam.phone LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerPhone}), '%')
@@ -143,12 +144,14 @@
         LEFT JOIN da_store as das on dam.store_id=das.id
         LEFT JOIN da_organization dao1 on dao1.id= das.org_id
         LEFT JOIN da_organization dao2 on dao2.id= das.operation_center_org_id
+        LEFT JOIN da_organization dao3 on dao3.id=darr.org_id
         where darr.is_delete=0
         <if test="queryParams.tradeScene != null">
             and darrr.trade_scene = #{queryParams.tradeScene}
         </if>
         <if test="queryParams.revenueOwnerName != null and queryParams.revenueOwnerName != '' ">
-            AND dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')
+            AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') or
+            dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%'))
         </if>
         <if test="queryParams.revenueOwnerPhone != null and queryParams.revenueOwnerPhone != '' ">
             AND dam.phone LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerPhone}), '%')