From 0e1238faa0537377afc9f6edfae7e99d8f438fb3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 八月 2025 15:50:52 +0800
Subject: [PATCH] 权限管理，广告资讯
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2cd3055..70e8f0b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
- <resultMap type="SysUser" id="SysUserResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="userName" column="user_name" />
@@ -30,7 +30,7 @@
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
- <resultMap id="deptResult" type="SysDept">
+ <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="deptName" column="dept_name" />
@@ -40,7 +40,7 @@
<result property="status" column="dept_status" />
</resultMap>
- <resultMap id="RoleResult" type="SysRole">
+ <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
@@ -60,7 +60,7 @@
left join sys_role r on r.role_id = ur.role_id
</sql>
- <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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
@@ -90,7 +90,7 @@
${params.dataScope}
</select>
- <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" 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
@@ -107,7 +107,7 @@
${params.dataScope}
</select>
- <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" 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
@@ -236,12 +236,17 @@
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
- <if test="query.nickNameOrPhone != null and query.nickNameOrPhone != ''">
- AND (u.nick_name LIKE concat('%',#{query.nickNameOrPhone},'%')
- OR u.phonenumber LIKE concat('%',#{query.nickNameOrPhone},'%'))
+ <if test="query.nickName != null and query.nickName != ''">
+ AND u.nick_name LIKE concat('%',#{query.nickName},'%')
</if>
<if test="query.status != null and query.status != ''">
AND u.status = #{query.status}
+ </if>
+ <if test="query.phonenumber != null and query.phonenumber != ''">
+ AND u.phonenumber LIKE concat('%',#{query.phonenumber},'%')
+ </if>
+ <if test="query.roleType != null">
+ AND u.role_type = #{query.roleType}
</if>
<if test="query.deptIds != null and query.deptIds.size()>0">
AND u.user_id IN (select DISTINCT user_id from t_dept_to_user where dept_id IN
@@ -261,7 +266,7 @@
select user_id from sys_user where phonenumber = #{phonenumber} and status = 0 and del_flag = 0
</select>
- <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+ <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.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>
@@ -278,29 +283,29 @@
<if test="remark != null and remark != ''">remark,</if>
<if test="ifBlack != null">ifBlack,</if>
<if test="districtId != null">districtId,</if>
+ <if test="roleType != null">role_type,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
- <if test="deptName != null and deptName != ''">#{deptName},</if>
-
- <if test="nickName != null and nickName != ''">#{nickName},</if>
+ <if test="deptName != null and deptName != ''">#{deptName},</if>
+ <if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- <if test="sex != null and sex != ''">#{sex},</if>
+ <if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="ifBlack != null">#{ifBlack},</if>
- <if test="districtId != null">#{districtId},</if>
+ <if test="roleType != null">#{roleType},</if>
sysdate()
)
</insert>
- <update id="updateUser" parameterType="SysUser">
+ <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
@@ -327,15 +332,15 @@
where user_id = #{userId}
</update>
- <update id="updateUserStatus" parameterType="SysUser">
+ <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
- <update id="updateUserAvatar" parameterType="SysUser">
+ <update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
- <update id="resetUserPwd" parameterType="SysUser">
+ <update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
<update id="updateUserIfBlack">
--
Gitblit v1.7.1