From 826976ff37a83fc8fec64aeb19727d69afc6fcfa Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 31 七月 2025 16:05:24 +0800
Subject: [PATCH] 修改人员角色绑定
---
multi-system/src/main/resources/mapper/system/SysUserMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b4be28b..4c0eb6f 100644
--- a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -32,8 +32,19 @@
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="entryTime" column="entry_time" />
+ <result property="resignTime" column="resign_time" />
+ <result property="personType" column="person_type" />
+ <result property="age" column="age" />
+ <result property="positional" column="positional" />
+
</resultMap>
+ <resultMap id="SysUserVoResult" type="com.gkhy.exam.common.domain.entity.SysUser" extends="SysUserResult">
+ <collection property="roles" ofType="com.gkhy.exam.common.domain.entity.SysRole" column="userId = id" select="getReponseData">
+ <result property="roleId" column="role_id" />
+ <result property="roleName" column="role_name" />
+ </collection>
+ </resultMap>
<delete id="deleteUserById" parameterType="java.lang.Long">
@@ -46,14 +57,20 @@
where username=#{username} and del_flag=0 limit 1
</select>
- <select id="userList" resultMap="SysUserResult">
+ <select id="getReponseData" resultType="com.gkhy.exam.common.domain.entity.SysRole">
+ select r.role_name,r.role_id from sys_user_role ur
+ left join sys_role r on r.role_id=ur.role_id
+ where ur.user_id = #{userId}
+ </select>
+ <select id="userList" resultMap="SysUserVoResult">
select u.id,u.username,u.name,u.user_type,u.phone,u.parent_id,u.company_id,u.sex,u.status,u.del_flag,u.version,
u.login_ip,u.login_date,u.create_by,u.create_time,u.remark,c.name as company_name,su.name as parent_name,
- u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time
+ u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional
from sys_user u
left join sys_company c on c.id=u.company_id
left join sys_user su on su.id=u.parent_id and u.parent_id!=0
left join sys_dept d on d.dept_id=u.dept_id
+
<where>
and u.del_flag = 0
<if test="username != null and username != ''">
@@ -67,6 +84,9 @@
</if>
<if test="userType != null">
AND u.user_type = #{userType}
+ </if>
+ <if test="deptId != null">
+ AND d.dept_id = #{deptId}
</if>
<if test="companyId != null ">
AND u.company_id = #{companyId}
@@ -102,7 +122,7 @@
<select id="getUserById" resultMap="SysUserResult">
select u.id,u.username,u.user_type,u.name,u.phone,u.parent_id,u.company_id,u.status,u.sex,u.del_flag,u.version,c.name as company_name,
- c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time
+ c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional
from sys_user u
left join sys_company c on c.id=u.company_id
left join sys_user su on su.id=u.parent_id and u.parent_id!=0
--
Gitblit v1.9.2