From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 fd25827..cc8db74 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -29,6 +29,7 @@
<select id="selectUserPage" resultMap="userResultMap">
select * from blade_user where is_deleted = 0
+ and id != 1123598821738675201
<if test="tenantId!=null and tenantId != ''">
and tenant_id = #{tenantId}
</if>
@@ -36,10 +37,13 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and account like concat('%', #{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and real_name like concat('%',#{user.realName},'%')
+ </if>
+ <if test="user.name!=null and user.name != ''">
+ and name like concat('%',#{user.name},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -73,4 +77,28 @@
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>
+
+ <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
+ SELECT
+ bu.*
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ LEFT JOIN jczz_district jd on jd.aoi_code=jda.aoi_code
+ WHERE
+ jd.id = #{districtId}
+ and bu.is_deleted = '0'
+ and jh.is_deleted = '0'
+
+ </select>
+
</mapper>
--
Gitblit v1.9.3