From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e7df625..47651b2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -22,6 +22,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="forbiddenRemark" column="forbidden_remark"/>
<result property="remark" column="remark" />
<result property="roleType" column="roleType" />
<result property="objectId" column="objectId" />
@@ -43,7 +44,6 @@
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
<result property="dataScope" column="data_scope" />
<result property="status" column="role_status" />
</resultMap>
@@ -51,7 +51,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_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_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status ,u.roleType as roleType,u.objectId AS objectId
+ r.role_id, r.role_name, r.role_key, r.data_scope, r.status as role_status ,u.roleType as roleType,u.objectId AS objectId
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
@@ -123,12 +123,26 @@
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
- <select id="getList" resultType="com.ruoyi.system.api.domain.SysUser">
- select *,nick_name nickName,login_date loginDate,create_time createTime,user_id userId from sys_user where 1=1
- <if test="phonenumber !=null and phonenumber !=''">
- and phonenumber like concat("%", #{phonenumber},"%")
+ <select id="getList" resultMap="SysUserResult">
+ select * from sys_user where 1=1
+ <if test="req.search !=null and req.search !=''">
+ and (phonenumber like concat("%", #{req.search},"%") or nick_name like concat("%", #{req.search},"%"))
</if>
- and del_flag = '0' and roleType =1
+ <if test="null != req.siteId">
+ and user_id in (select user_id from t_user_site where site_id = #{req.siteId})
+ and user_id in (select user_id from sys_user_role where role_id in (select role_id from t_role_site where site_id = #{req.siteId}))
+ </if>
+ <if test="null != req.roleIds and req.roleIds.size() > 0">
+ and user_id in (select user_id from sys_user_role where role_id in
+ <foreach collection="req.roleIds" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ <if test="null != req.status">
+ and status = #{req.status}
+ </if>
+ and del_flag = '0' and roleType =1
order by create_time desc
</select>
<select id="getAllList" resultType="com.ruoyi.system.api.domain.SysUser">
@@ -142,8 +156,25 @@
<select id="getSysUserFromPhone" resultType="java.lang.Long">
select user_id from sys_user where phonenumber =#{phoneNumber}
</select>
+ <select id="getChangeUserList" resultType="com.ruoyi.system.api.domain.SysUser">
+ select
+ user_id AS userId,
+ nick_name AS nickName,
+ user_name AS userName,
+ create_time AS createTime,
+ remark AS remark
+ from sys_user
+ <where>
+ <if test="query.nickName != null and query.nickName != ''">
+ AND nick_name LIKE concat('%',#{query.nickName},'%')
+ </if>
+ AND del_flag = '0'
+ AND roleType = 1
+ </where>
+ ORDER BY create_time DESC
+ </select>
- <insert id="insertUser" parameterType="com.ruoyi.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
+ <insert id="insertUser" parameterType="com.ruoyi.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -195,6 +226,7 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="forbiddenRemark != null">forbidden_remark = #{forbiddenRemark},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.7.1