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} - AND dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') + AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') + dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')) 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 and darrr.trade_scene = #{queryParams.tradeScene} - 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}), '%')) AND dam.phone LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerPhone}), '%')