|
|
|
@ -18,12 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<result property="delFlag" column="del_flag" /> |
|
|
|
<result property="loginIp" column="login_ip" /> |
|
|
|
<result property="loginDate" column="login_date" /> |
|
|
|
<result property="pwdUpdateDate" column="pwd_update_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" column="dept_id" javaType="SysDept" resultMap="deptResult" /> |
|
|
|
<association property="dept" javaType="SysDept" resultMap="deptResult" /> |
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
</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, |
|
|
|
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.pwd_update_date, u.create_by, u.create_time, u.remark, |
|
|
|
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 |
|
|
|
@ -73,10 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
AND u.phonenumber like concat('%', #{phonenumber}, '%') |
|
|
|
</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') |
|
|
|
AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') |
|
|
|
</if> |
|
|
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> |
|
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') |
|
|
|
AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') |
|
|
|
</if> |
|
|
|
<if test="deptId != null and deptId != 0"> |
|
|
|
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) |
|
|
|
@ -154,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<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="pwdUpdateDate != null">pwd_update_date,</if> |
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if> |
|
|
|
<if test="remark != null and remark != ''">remark,</if> |
|
|
|
create_time |
|
|
|
@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<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="pwdUpdateDate != null">#{pwdUpdateDate},</if> |
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if> |
|
|
|
<if test="remark != null and remark != ''">#{remark},</if> |
|
|
|
sysdate() |
|
|
|
@ -177,8 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<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="deptId != 0">dept_id = #{deptId},</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> |
|
|
|
@ -196,15 +198,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
</update> |
|
|
|
|
|
|
|
<update id="updateUserStatus" parameterType="SysUser"> |
|
|
|
update sys_user set status = #{status} where user_id = #{userId} |
|
|
|
update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId} |
|
|
|
</update> |
|
|
|
|
|
|
|
<update id="updateUserAvatar" parameterType="SysUser"> |
|
|
|
update sys_user set avatar = #{avatar} where user_name = #{userName} |
|
|
|
update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId} |
|
|
|
</update> |
|
|
|
|
|
|
|
<update id="updateLoginInfo" parameterType="SysUser"> |
|
|
|
update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId} |
|
|
|
</update> |
|
|
|
|
|
|
|
<update id="resetUserPwd" parameterType="SysUser"> |
|
|
|
update sys_user set password = #{password} where user_name = #{userName} |
|
|
|
update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId} |
|
|
|
</update> |
|
|
|
|
|
|
|
<delete id="deleteUserById" parameterType="Long"> |
|
|
|
@ -218,11 +224,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
</foreach> |
|
|
|
</delete> |
|
|
|
|
|
|
|
<update id="updateLoginInfo"> |
|
|
|
update sys_user |
|
|
|
set login_ip = #{loginIp}, |
|
|
|
login_date = #{loginDate}, |
|
|
|
update_time = sysdate() |
|
|
|
where user_name = #{param3} |
|
|
|
</update> |
|
|
|
</mapper> |
ChaiNingQi
3 days ago