From 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Dec 2023 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index e65c4d3..2b64e98 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -74,4 +74,13 @@
         SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
 
+    <!--按条件查询用户信息-->
+    <select id="getUserListByParam" resultType="org.springblade.modules.system.vo.UserVO">
+        SELECT id, account, name, real_name, phone, role_id, dept_id, post_id FROM blade_user
+        where is_deleted = 0
+        <if test="user.roleId!=null and user.roleId!=''">
+            and role_id like concat('%',#{user.roleId},'%')
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.9.3