From 8cafbab40d015f3152705285feee437265489efa Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Fri, 24 May 2024 14:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index d45d752..7c9f87f 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -81,6 +81,9 @@
             <if test="param.isStaff != null">
               AND a.organization_id > 0
             </if>
+            <if test="param.merchantId != null">
+              AND a.merchant_id = #{param.merchantId}
+            </if>
             <if test="param.platform != null">
               AND a.platform = #{param.platform}
             </if>