From 338f2f5afc7762dabf2409f296d5d023462ed4b5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 28 八月 2025 17:18:25 +0800
Subject: [PATCH] 部分新功能
---
multi-system/src/main/resources/mapper/system/SysUserMapper.xml | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 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 de62190..106ef79 100644
--- a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -36,9 +36,17 @@
<result property="personType" column="person_type" />
<result property="age" column="age" />
<result property="positional" column="positional" />
+ <result property="qualification" column="qualification" />
+ <result property="operationCertificate" column="operation_certificate" />
</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">
@@ -51,14 +59,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.resign_time,u.person_type,u.age,u.positional
+ 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,u.qualification,u.operation_certificate
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 != ''">
@@ -69,6 +83,12 @@
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
+ </if>
+ <if test="personType != null">
+ AND u.person_type = #{personType}
+ </if>
+ <if test="qualification != null">
+ AND u.qualification = #{qualification}
</if>
<if test="userType != null">
AND u.user_type = #{userType}
@@ -81,6 +101,9 @@
</if>
<if test="phone != null and phone != ''">
AND u.phone like concat('%', #{phone}, '%')
+ </if>
+ <if test="post != null and post != ''">
+ AND u.post like concat('%', #{post}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
@@ -97,6 +120,7 @@
<if test="params.userType != null and params.userType==0">
AND u.user_type in (1,2,3,4)
</if>
+
</where>
order by u.id desc
</select>
@@ -110,7 +134,8 @@
<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,u.resign_time,u.person_type,u.age,u.positional
+ 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,u.qualification,u.operation_certificate
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
@@ -162,4 +187,7 @@
</if>
</select>
+
+
+
</mapper>
--
Gitblit v1.9.2