From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 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..0c17a3d 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,73 @@
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>
+
+ <!--根据手机号查询对应账号和手机号的用户信息-->
+ <select id="getUserListByPhoneOrAccount" resultType="org.springblade.modules.system.entity.User">
+ SELECT * FROM blade_user where is_deleted = 0
+ and (account = #{phoneNumber} or phone = #{phoneNumber})
+ </select>
+
+ <!--用户详情接口-->
+ <select id="getUserInfo" resultType="org.springblade.modules.system.vo.UserDetailVO">
+ SELECT * FROM blade_user where is_deleted = 0
+ and id = #{userId}
+ </select>
+
+
+ <select id="searchUserById" resultType="org.springblade.modules.system.vo.UserVO">
+ select
+ id userId,
+ tenant_id,
+ code,
+ user_type,
+ account,
+ name,
+ real_name,
+ avatar,
+ email,
+ phone,
+ birthday,
+ sex,
+ role_id,
+ dept_id,
+ post_id,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ from
+ blade_user
+ where
+ id = #{id}
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.3