From 4a3467b5d66db6ede3b4cc1b942399c7a36aadf5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 28 八月 2025 14:01:15 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0e84df6..2cd3055 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,7 +25,7 @@
<result property="remark" column="remark" />
<result property="ifBlack" column="ifBlack" />
<result property="districtId" column="districtId" />
- <result property="businessDeptId" column="business_dept_id" />
+ <result property="roleType" column="role_type" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -50,7 +50,8 @@
</resultMap>
<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, u.business_dept_id,
+ 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,u.role_type as roleType,
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
from sys_user u
@@ -132,7 +133,8 @@
<select id="selectUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,u.business_dept_id AS businessDeptId,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
+ u.districtId AS districtId,u.role_type as roleType,
ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -162,7 +164,8 @@
<select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.role_type as roleType,
+ u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
from sys_user u
WHERE u.del_flag = 0
</select>
@@ -178,7 +181,8 @@
<select id="selectListByNamePhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.role_type as roleType,
+ u.ifBlack AS ifBlack, u.districtId AS districtId
from sys_user u
WHERE u.del_flag = 0
<if test="name != null and name != ''">
@@ -207,7 +211,7 @@
<select id="selectByPhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.role_type as roleType,u.remark AS remark
from sys_user u where u.phonenumber = #{phonenumber} and u.status = 0 and u.del_flag = 0
</select>
<select id="getUserInfoBy" resultType="com.ruoyi.system.vo.UserInfoVo">
@@ -222,11 +226,12 @@
select * from sys_user
</select>
<select id="pageList" resultType="com.ruoyi.system.vo.SysUserVO">
- select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,u.disable_remark AS disableRemark,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
+ select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
+ u.disable_remark AS disableRemark,u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag,
+ u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,u.role_type as roleType,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,
- r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName,
- u.business_dept_id AS businessDeptId
+ r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope,
+ r.status as role_status,u.deptName as deptName
from sys_user u
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
@@ -249,9 +254,6 @@
<foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
#{roleId}
</foreach>
- </if>
- <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0">
- AND u.business_dept_id = #{query.businessDeptId}
</if>
ORDER BY u.create_time DESC
</select>
@@ -276,7 +278,6 @@
<if test="remark != null and remark != ''">remark,</if>
<if test="ifBlack != null">ifBlack,</if>
<if test="districtId != null">districtId,</if>
- <if test="businessDeptId != null">business_dept_id,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -295,7 +296,6 @@
<if test="remark != null and remark != ''">#{remark},</if>
<if test="ifBlack != null">#{ifBlack},</if>
<if test="districtId != null">#{districtId},</if>
- <if test="businessDeptId != null">#{businessDeptId},</if>
sysdate()
)
</insert>
@@ -322,7 +322,6 @@
<if test="disableRemark != null">disable_remark = #{disableRemark},</if>
<if test="operatingTime != null">operating_time = #{operatingTime},</if>
<if test="operatingPerson != null">operating_person = #{operatingPerson},</if>
- <if test="businessDeptId != null">business_dept_id = #{businessDeptId},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.7.1