From e7326734f13adfe0033798337181fcc6c0b227ae Mon Sep 17 00:00:00 2001
From: uu <1197651512@qq.com>
Date: Thu, 20 Jun 2024 20:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8C=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/easy/admin/auth/dao/SysUserMapper.java  |  6 +++---
 .../easy/admin/auth/dao/mapping/SysUserMapper.xml    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java b/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java
index f98d54b..3ca1cfd 100644
--- a/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java
+++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java
@@ -129,10 +129,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 
 
-    IPage<UserInfoResponse> getAllUserPage(Page page, @Param("User") UserInfoRequest request);
+    IPage<UserInfoResponse> getAllUserPage(Page page, @Param("request") UserInfoRequest request);
 
-    IPage<UserInfoResponse> getUserPageByCondition(Page page, @Param("User") UserInfoRequest request,@Param("condition") String condition);
+    IPage<UserInfoResponse> getUserPageByCondition(Page page, @Param("request") UserInfoRequest request,@Param("condition") String condition);
 
-    IPage<UserInfoResponse> getUserPageByConditions(Page page, @Param("User") UserInfoRequest request,@Param("condition") String condition1,@Param("condition1")String condition2);
+    IPage<UserInfoResponse> getUserPageByConditions(Page page, @Param("request") UserInfoRequest request,@Param("condition") String condition1,@Param("condition1")String condition2);
 
 }
\ No newline at end of file
diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
index 3d9ebc8..fb82cac 100644
--- a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
+++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
@@ -130,6 +130,18 @@
         select t.id as id,  t.nickname as nickname,  t.sex as sex, t.phone_number as phoneNumber,t.workplace as workplace
         from sys_user t
         <where>
+            <if test="request.nickname!=null and request.nickname!=''">
+                and nickname =  #{request.nickname}
+            </if>
+            <if test="request.phoneNumber!=null and request.phoneNumber!=''">
+                and phone_number =  #{request.phoneNumber}
+            </if>
+            <if test="request.workplace!=null and request.workplace!=''">
+                and workplace =  #{request.workplace}
+            </if>
+            <if test="request.role!=null and request.role!=''">
+                and id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
+            </if>
         </where>
     </select>
     <select id="getUserPageByCondition" resultMap="UserInfoResponse" parameterType="com.easy.admin.auth.model.UserInfoRequest">