From 2285a94958b82f68be13deff6dec12e151407d47 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 14 三月 2022 14:06:43 +0800
Subject: [PATCH] update 更新首页关于 权限认证框架 框架说明 改为 Sa-Token
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 67 ++++-----------------------------
1 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ef968ad..3117788 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -82,89 +82,38 @@
left join sys_role r on r.role_id = ur.role_id
</sql>
- <select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
sys_user u
left join sys_dept d on u.dept_id = d.dept_id
- where u.del_flag = '0'
- <if test="user.userId != null and user.userId != 0">
- AND u.user_id = #{user.userId}
- </if>
- <if test="user.userName != null and user.userName != ''">
- AND u.user_name like concat('%', #{user.userName}, '%')
- </if>
- <if test="user.status != null and user.status != ''">
- AND u.status = #{user.status}
- </if>
- <if test="user.phonenumber != null and user.phonenumber != ''">
- AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
- </if>
- <if test="user.params.beginTime != null and user.params.endTime != null">
- AND u.create_time between #{user.params.beginTime} and #{user.params.endTime}
- </if>
- <if test="user.deptId != null and user.deptId != 0">
- AND (u.dept_id = #{user.deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{user.deptId},
- ancestors) ))
- </if>
+ ${ew.getCustomSqlSegment}
</select>
- <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
sys_user u
left join sys_dept d on u.dept_id = d.dept_id
- where u.del_flag = '0'
- <if test="userId != null and userId != 0">
- AND u.user_id = #{userId}
- </if>
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND u.status = #{status}
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <if test="params.beginTime != null and params.endTime != null">
- AND u.create_time between #{params.beginTime} and #{params.endTime}
- </if>
- <if test="deptId != null and deptId != 0">
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
- ancestors) ))
- </if>
+ ${ew.getCustomSqlSegment}
</select>
- <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectAllocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and r.role_id = #{user.roleId}
- <if test="user.userName != null and user.userName != ''">
- AND u.user_name like concat('%', #{user.userName}, '%')
- </if>
- <if test="user.phonenumber != null and user.phonenumber != ''">
- AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
- </if>
+ ${ew.getCustomSqlSegment}
</select>
- <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUnallocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and (r.role_id != #{user.roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{user.roleId})
- <if test="user.userName != null and user.userName != ''">
- AND u.user_name like concat('%', #{user.userName}, '%')
- </if>
- <if test="user.phonenumber != null and user.phonenumber != ''">
- AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
- </if>
+ ${ew.getCustomSqlSegment}
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
--
Gitblit v1.9.3