From c9bea15c34b49d38842b6f95c808e27c15b4b3b2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Jun 2024 09:39:26 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisCustomerUserMapper.xml     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 885bf63f1..d4645a105 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -149,8 +149,17 @@
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
-            <if test="payee != null  and payee != ''"> and payee=#{payee}</if>
-            <if test="salesmen != null  and salesmen != ''"> and salesmen=#{salesmen}</if>
+            <choose>
+                <when test="payee != null  and payee != '' and salesmen != null  and salesmen != ''">
+                    and (payee=#{payee} or salesmen=#{salesmen})
+                </when>
+                <otherwise>
+                    <if test="payee != null  and payee != ''"> and payee=#{payee}</if>
+                    <if test="salesmen != null  and salesmen != ''"> and salesmen=#{salesmen}</if>
+                </otherwise>
+            </choose>
+
+
         </where>
         order by create_time desc
     </select>