From 02d8d9961bb73d6b50b8a9f87855ebfb94b6a02c Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Fri, 24 May 2024 13:20:35 +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

---
 src/main/java/com/gxwebsoft/common/system/entity/User.java | 1 -
 .../com/gxwebsoft/common/system/mapper/xml/UserMapper.xml  | 4 +---
 .../java/com/gxwebsoft/common/system/param/UserParam.java  | 7 +++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index e878bac..b011c9a 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -159,7 +159,6 @@ public class User implements UserDetails {
     private Integer merchantId;
 
     @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
     private String merchantName;
 
     @ApiModelProperty(value = "是否管理员")
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 cd345e7..d45d752 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
@@ -26,8 +26,7 @@
     <sql id="selectSql">
         SELECT a.*,
         b.organization_name,
-        c.dict_data_name sex_name,
-        e.merchant_name as merchantName
+        c.dict_data_name sex_name
         FROM sys_user a
         LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
         LEFT JOIN (
@@ -36,7 +35,6 @@
         LEFT JOIN(
         <include refid="selectUserRoleSql"/>
         ) d ON a.user_id = d.user_id
-        LEFT JOIN sys_merchant e ON a.merchant_id = e.merchant_id
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
index 57e6c74..798c31e 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -221,4 +221,11 @@ public class UserParam extends BaseParam {
     @ApiModelProperty("openId")
     @TableField(exist = false)
     private String openId;
+
+    @ApiModelProperty(value = "商户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer merchantId;
+
+    @ApiModelProperty(value = "商户名称")
+    private String merchantName;
 }