| @@ -1,52 +1,54 @@ | |||||
| <?xml version="1.0" encoding="UTF-8" ?> | <?xml version="1.0" encoding="UTF-8" ?> | ||||
| <!DOCTYPE mapper | <!DOCTYPE mapper | ||||
| PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
| "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||||
| PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
| "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||||
| <mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> | <mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> | ||||
| <resultMap type="SysUser" id="SysUserResult"> | <resultMap type="SysUser" id="SysUserResult"> | ||||
| <id property="userId" column="user_id" /> | |||||
| <result property="deptId" column="dept_id" /> | |||||
| <result property="userName" column="user_name" /> | |||||
| <result property="nickName" column="nick_name" /> | |||||
| <result property="email" column="email" /> | |||||
| <result property="phonenumber" column="phonenumber" /> | |||||
| <result property="sex" column="sex" /> | |||||
| <result property="avatar" column="avatar" /> | |||||
| <result property="password" column="password" /> | |||||
| <result property="status" column="status" /> | |||||
| <result property="delFlag" column="del_flag" /> | |||||
| <result property="loginIp" column="login_ip" /> | |||||
| <result property="loginDate" column="login_date" /> | |||||
| <result property="createBy" column="create_by" /> | |||||
| <result property="createTime" column="create_time" /> | |||||
| <result property="updateBy" column="update_by" /> | |||||
| <result property="updateTime" column="update_time" /> | |||||
| <result property="remark" column="remark" /> | |||||
| <association property="dept" javaType="SysDept" resultMap="deptResult" /> | |||||
| <collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> | |||||
| <id property="userId" column="user_id"/> | |||||
| <result property="deptId" column="dept_id"/> | |||||
| <result property="userName" column="user_name"/> | |||||
| <result property="nickName" column="nick_name"/> | |||||
| <result property="email" column="email"/> | |||||
| <result property="phonenumber" column="phonenumber"/> | |||||
| <result property="sex" column="sex"/> | |||||
| <result property="avatar" column="avatar"/> | |||||
| <result property="password" column="password"/> | |||||
| <result property="status" column="status"/> | |||||
| <result property="delFlag" column="del_flag"/> | |||||
| <result property="loginIp" column="login_ip"/> | |||||
| <result property="loginDate" column="login_date"/> | |||||
| <result property="createBy" column="create_by"/> | |||||
| <result property="createTime" column="create_time"/> | |||||
| <result property="updateBy" column="update_by"/> | |||||
| <result property="updateTime" column="update_time"/> | |||||
| <result property="remark" column="remark"/> | |||||
| <result property="gitLinkUsername" column="git_link_username"/> | |||||
| <result property="gitLinkPassword" column="git_link_password"/> | |||||
| <association property="dept" javaType="SysDept" resultMap="deptResult"/> | |||||
| <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> | |||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="deptResult" type="SysDept"> | <resultMap id="deptResult" type="SysDept"> | ||||
| <id property="deptId" column="dept_id" /> | |||||
| <result property="parentId" column="parent_id" /> | |||||
| <result property="deptName" column="dept_name" /> | |||||
| <result property="ancestors" column="ancestors" /> | |||||
| <result property="orderNum" column="order_num" /> | |||||
| <result property="leader" column="leader" /> | |||||
| <result property="status" column="dept_status" /> | |||||
| <id property="deptId" column="dept_id"/> | |||||
| <result property="parentId" column="parent_id"/> | |||||
| <result property="deptName" column="dept_name"/> | |||||
| <result property="ancestors" column="ancestors"/> | |||||
| <result property="orderNum" column="order_num"/> | |||||
| <result property="leader" column="leader"/> | |||||
| <result property="status" column="dept_status"/> | |||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="RoleResult" type="SysRole"> | <resultMap id="RoleResult" type="SysRole"> | ||||
| <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" /> | |||||
| <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> | </resultMap> | ||||
| <sql id="selectUserVo"> | |||||
| <sql id="selectUserVo"> | |||||
| select u.user_id, | select u.user_id, | ||||
| u.dept_id, | u.dept_id, | ||||
| u.user_name, | u.user_name, | ||||
| @@ -83,9 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
| left join sys_user_role ur on u.user_id = ur.user_id | 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 | left join sys_role r on r.role_id = ur.role_id | ||||
| </sql> | </sql> | ||||
| <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> | <select id="selectUserList" parameterType="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.git_link_username, | |||||
| select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, | |||||
| u.git_link_username, | |||||
| u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader | 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 | from sys_user u | ||||
| left join sys_dept d on u.dept_id = d.dept_id | left join sys_dept d on u.dept_id = d.dept_id | ||||
| @@ -115,63 +118,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
| <!-- 数据范围过滤 --> | <!-- 数据范围过滤 --> | ||||
| ${params.dataScope} | ${params.dataScope} | ||||
| </select> | </select> | ||||
| <select id="selectAllocatedList" parameterType="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 | |||||
| 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' and r.role_id = #{roleId} | |||||
| <if test="userName != null and userName != ''"> | |||||
| AND u.user_name like concat('%', #{userName}, '%') | |||||
| </if> | |||||
| <if test="phonenumber != null and phonenumber != ''"> | |||||
| AND u.phonenumber like concat('%', #{phonenumber}, '%') | |||||
| </if> | |||||
| <!-- 数据范围过滤 --> | |||||
| ${params.dataScope} | |||||
| </select> | |||||
| <select id="selectUnallocatedList" parameterType="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 | |||||
| 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' and (r.role_id != #{roleId} or r.role_id IS NULL) | |||||
| and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) | |||||
| <if test="userName != null and userName != ''"> | |||||
| AND u.user_name like concat('%', #{userName}, '%') | |||||
| </if> | |||||
| <if test="phonenumber != null and phonenumber != ''"> | |||||
| AND u.phonenumber like concat('%', #{phonenumber}, '%') | |||||
| </if> | |||||
| <!-- 数据范围过滤 --> | |||||
| ${params.dataScope} | |||||
| </select> | |||||
| <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> | |||||
| <include refid="selectUserVo"/> | |||||
| where u.user_name = #{userName} and u.del_flag = '0' | |||||
| </select> | |||||
| <select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> | |||||
| <include refid="selectUserVo"/> | |||||
| where u.user_id = #{userId} | |||||
| </select> | |||||
| <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> | |||||
| select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 | |||||
| </select> | |||||
| <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> | |||||
| select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1 | |||||
| </select> | |||||
| <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="selectAllocatedList" parameterType="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, u.git_link_username | |||||
| 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 | |||||
| left join sys_role r on r.role_id = ur.role_id | |||||
| where u.del_flag = '0' and r.role_id = #{roleId} | |||||
| <if test="userName != null and userName != ''"> | |||||
| AND u.user_name like concat('%', #{userName}, '%') | |||||
| </if> | |||||
| <if test="phonenumber != null and phonenumber != ''"> | |||||
| AND u.phonenumber like concat('%', #{phonenumber}, '%') | |||||
| </if> | |||||
| <!-- 数据范围过滤 --> | |||||
| ${params.dataScope} | |||||
| </select> | |||||
| <select id="selectUnallocatedList" parameterType="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 ,u.git_link_username | |||||
| 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 | |||||
| left join sys_role r on r.role_id = ur.role_id | |||||
| where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) | |||||
| and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and | |||||
| ur.role_id = #{roleId}) | |||||
| <if test="userName != null and userName != ''"> | |||||
| AND u.user_name like concat('%', #{userName}, '%') | |||||
| </if> | |||||
| <if test="phonenumber != null and phonenumber != ''"> | |||||
| AND u.phonenumber like concat('%', #{phonenumber}, '%') | |||||
| </if> | |||||
| <!-- 数据范围过滤 --> | |||||
| ${params.dataScope} | |||||
| </select> | |||||
| <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> | |||||
| <include refid="selectUserVo"/> | |||||
| where u.user_name = #{userName} and u.del_flag = '0' | |||||
| </select> | |||||
| <select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> | |||||
| <include refid="selectUserVo"/> | |||||
| where u.user_id = #{userId} | |||||
| </select> | |||||
| <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> | |||||
| select user_id, user_name | |||||
| from sys_user | |||||
| where user_name = #{userName} | |||||
| and del_flag = '0' limit 1 | |||||
| </select> | |||||
| <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> | |||||
| select user_id, phonenumber | |||||
| from sys_user | |||||
| where phonenumber = #{phonenumber} | |||||
| and del_flag = '0' limit 1 | |||||
| </select> | |||||
| <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="checktGitLinkUsernameUnique" resultType="com.ruoyi.system.api.domain.SysUser"> | <select id="checktGitLinkUsernameUnique" resultType="com.ruoyi.system.api.domain.SysUser"> | ||||
| select user_id, git_link_username | select user_id, git_link_username | ||||
| @@ -181,81 +194,93 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
| </select> | </select> | ||||
| <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> | <insert id="insertUser" parameterType="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> | |||||
| <if test="userName != null and userName != ''">user_name,</if> | |||||
| <if test="nickName != null and nickName != ''">nick_name,</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="password != null and password != ''">password,</if> | |||||
| <if test="status != null and status != ''">status,</if> | |||||
| <if test="createBy != null and createBy != ''">create_by,</if> | |||||
| <if test="remark != null and remark != ''">remark,</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="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="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> | |||||
| sysdate() | |||||
| ) | |||||
| </insert> | |||||
| <update id="updateUser" parameterType="SysUser"> | |||||
| update sys_user | |||||
| <set> | |||||
| <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> | |||||
| <if test="userName != null and userName != ''">user_name = #{userName},</if> | |||||
| <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> | |||||
| <if test="email != null ">email = #{email},</if> | |||||
| <if test="phonenumber != null ">phonenumber = #{phonenumber},</if> | |||||
| <if test="sex != null and sex != ''">sex = #{sex},</if> | |||||
| <if test="avatar != null and avatar != ''">avatar = #{avatar},</if> | |||||
| <if test="password != null and password != ''">password = #{password},</if> | |||||
| <if test="status != null and status != ''">status = #{status},</if> | |||||
| <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if> | |||||
| <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="gitLinkUsername != null and gitLinkUsername != ''">git_link_username = #{gitLinkUsername},</if> | |||||
| <if test="gitLinkPassword != null and gitLinkPassword != ''">git_link_password = #{gitLinkPassword},</if> | |||||
| update_time = sysdate() | |||||
| </set> | |||||
| where user_id = #{userId} | |||||
| </update> | |||||
| <update id="updateUserStatus" parameterType="SysUser"> | |||||
| update sys_user set status = #{status} where user_id = #{userId} | |||||
| </update> | |||||
| <update id="updateUserAvatar" parameterType="SysUser"> | |||||
| update sys_user set avatar = #{avatar} where user_name = #{userName} | |||||
| </update> | |||||
| <update id="resetUserPwd" parameterType="SysUser"> | |||||
| update sys_user set password = #{password} where user_name = #{userName} | |||||
| </update> | |||||
| <delete id="deleteUserById" parameterType="Long"> | |||||
| update sys_user set del_flag = '2' where user_id = #{userId} | |||||
| </delete> | |||||
| <delete id="deleteUserByIds" parameterType="Long"> | |||||
| update sys_user set del_flag = '2' where user_id in | |||||
| <foreach collection="array" item="userId" open="(" separator="," close=")"> | |||||
| #{userId} | |||||
| </foreach> | |||||
| </delete> | |||||
| insert into sys_user( | |||||
| <if test="userId != null and userId != 0">user_id,</if> | |||||
| <if test="deptId != null and deptId != 0">dept_id,</if> | |||||
| <if test="userName != null and userName != ''">user_name,</if> | |||||
| <if test="nickName != null and nickName != ''">nick_name,</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="password != null and password != ''">password,</if> | |||||
| <if test="status != null and status != ''">status,</if> | |||||
| <if test="createBy != null and createBy != ''">create_by,</if> | |||||
| <if test="remark != null and remark != ''">remark,</if> | |||||
| <if test="remark != null and remark != ''">git_link_username,</if> | |||||
| <if test="remark != null and remark != ''">git_link_password,</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="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="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="gitLinkUsername != null and gitLinkUsername != ''">#{gitLinkUsername},</if> | |||||
| <if test="gitLinkPassword != null and gitLinkPassword != ''">#{gitLinkPassword},</if> | |||||
| sysdate() | |||||
| ) | |||||
| </insert> | |||||
| <update id="updateUser" parameterType="SysUser"> | |||||
| update sys_user | |||||
| <set> | |||||
| <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> | |||||
| <if test="userName != null and userName != ''">user_name = #{userName},</if> | |||||
| <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> | |||||
| <if test="email != null ">email = #{email},</if> | |||||
| <if test="phonenumber != null ">phonenumber = #{phonenumber},</if> | |||||
| <if test="sex != null and sex != ''">sex = #{sex},</if> | |||||
| <if test="avatar != null and avatar != ''">avatar = #{avatar},</if> | |||||
| <if test="password != null and password != ''">password = #{password},</if> | |||||
| <if test="status != null and status != ''">status = #{status},</if> | |||||
| <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if> | |||||
| <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="gitLinkUsername != null and gitLinkUsername != ''">git_link_username = #{gitLinkUsername},</if> | |||||
| <if test="gitLinkPassword != null and gitLinkPassword != ''">git_link_password = #{gitLinkPassword},</if> | |||||
| update_time = sysdate() | |||||
| </set> | |||||
| where user_id = #{userId} | |||||
| </update> | |||||
| <update id="updateUserStatus" parameterType="SysUser"> | |||||
| update sys_user | |||||
| set status = #{status} | |||||
| where user_id = #{userId} | |||||
| </update> | |||||
| <update id="updateUserAvatar" parameterType="SysUser"> | |||||
| update sys_user | |||||
| set avatar = #{avatar} | |||||
| where user_name = #{userName} | |||||
| </update> | |||||
| <update id="resetUserPwd" parameterType="SysUser"> | |||||
| update sys_user | |||||
| set password = #{password} | |||||
| where user_name = #{userName} | |||||
| </update> | |||||
| <delete id="deleteUserById" parameterType="Long"> | |||||
| update sys_user | |||||
| set del_flag = '2' | |||||
| where user_id = #{userId} | |||||
| </delete> | |||||
| <delete id="deleteUserByIds" parameterType="Long"> | |||||
| update sys_user set del_flag = '2' where user_id in | |||||
| <foreach collection="array" item="userId" open="(" separator="," close=")"> | |||||
| #{userId} | |||||
| </foreach> | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||