From 9748cf4e9f1c41eb611c81ce32bd052e77959757 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 27 May 2024 18:19:19 +0800
Subject: [PATCH] =?UTF-8?q?user=E8=A1=A8=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5merchants?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index f4ec57a..da13efd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,6 +323,8 @@
         </configuration>
       </plugin>
     </plugins>
+
+
   </build>
 
   <repositories>
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 b011c9a..ce6137d 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -155,6 +155,9 @@ public class User implements UserDetails {
     @ApiModelProperty("客户端ID")
     private String clientId;
 
+    @ApiModelProperty(value = "可管理的商户")
+    private String merchants;
+
     @ApiModelProperty(value = "商户ID")
     private Integer merchantId;
 
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 7c9f87f..a5ddf05 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
@@ -142,7 +142,7 @@
               OR a.merchant_id = #{param.keywords}
               OR a.nickname LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.phone = #{param.keywords}
+              OR a.phone LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.email = #{param.keywords}
               )
             </if>
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 798c31e..68dedca 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -222,6 +222,10 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private String openId;
 
+    @ApiModelProperty(value = "可管理的商户")
+    @QueryField(type = QueryType.LIKE)
+    private String merchants;
+
     @ApiModelProperty(value = "商户ID")
     @QueryField(type = QueryType.EQ)
     private Integer merchantId;