apsbackend.git - Gitblit

			@@ -4,7 +4,7 @@
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.aps.system.mapper.SysUserMapper">

			<resultMap type="SysUser" id="SysUserResult">
			<resultMap type="com.aps.system.api.domain.SysUser" id="SysUserResult">
			<id property="userId" column="user_id" />
			<result property="deptId" column="dept_id" />
			<result property="userName" column="user_name" />
			@@ -23,11 +23,11 @@
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="remark" column="remark" />
			<association property="dept" javaType="SysDept" resultMap="deptResult" />
			<association property="dept" javaType="com.aps.system.api.domain.SysDept" resultMap="deptResult" />
			<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
			</resultMap>

			<resultMap id="deptResult" type="SysDept">
			<resultMap id="deptResult" type="com.aps.system.api.domain.SysDept">
			<id property="deptId" column="dept_id" />
			<result property="parentId" column="parent_id" />
			<result property="deptName" column="dept_name" />
			@@ -37,7 +37,7 @@
			<result property="status" column="dept_status" />
			</resultMap>

			<resultMap id="RoleResult" type="SysRole">
			<resultMap id="RoleResult" type="com.aps.system.api.domain.SysRole">
			<id property="roleId" column="role_id" />
			<result property="roleName" column="role_name" />
			<result property="roleKey" column="role_key" />
			@@ -56,7 +56,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.aps.system.api.domain.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
			where u.del_flag = '0'
			@@ -64,13 +64,13 @@
			AND u.user_id = #{userId}
			</if>
			<if test="userName != null and userName != ''">
			AND u.user_name like concat('%', #{userName}, '%')
			AND u.user_name like '%' \|\| #{userName} \|\| '%'
			</if>
			<if test="status != null and status != ''">
			AND u.status = #{status}
			</if>
			<if test="phonenumber != null and phonenumber != ''">
			AND u.phonenumber like concat('%', #{phonenumber}, '%')
			AND u.phonenumber like '%' \|\| #{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')
			@@ -85,7 +85,7 @@
			${params.dataScope}
			</select>

			<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
			<select id="selectAllocatedList" parameterType="com.aps.system.api.domain.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
			@@ -93,16 +93,16 @@
			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}, '%')
			AND u.user_name like '%' \|\| #{userName} \|\| '%'
			</if>
			<if test="phonenumber != null and phonenumber != ''">
			AND u.phonenumber like concat('%', #{phonenumber}, '%')
			AND u.phonenumber like '%' \|\| #{phonenumber} \|\| '%'
			</if>
			<!-- 数据范围过滤 -->
			${params.dataScope}
			</select>

			<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
			<select id="selectUnallocatedList" parameterType="com.aps.system.api.domain.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
			@@ -111,10 +111,10 @@
			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}, '%')
			AND u.user_name like '%' \|\| #{userName} \|\| '%'
			</if>
			<if test="phonenumber != null and phonenumber != ''">
			AND u.phonenumber like concat('%', #{phonenumber}, '%')
			AND u.phonenumber like '%' \|\| #{phonenumber} \|\| '%'
			</if>
			<!-- 数据范围过滤 -->
			${params.dataScope}
			@@ -142,7 +142,7 @@
			select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
			</select>

			<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
			<insert id="insertUser" parameterType="com.aps.system.api.domain.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>
			@@ -174,7 +174,7 @@
			)
			</insert>

			<update id="updateUser" parameterType="SysUser">
			<update id="updateUser" parameterType="com.aps.system.api.domain.SysUser">
			update sys_user
			<set>
			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
			@@ -194,15 +194,15 @@
			where user_id = #{userId}
			</update>

			<update id="updateUserStatus" parameterType="SysUser">
			<update id="updateUserStatus" parameterType="com.aps.system.api.domain.SysUser">
			update sys_user set status = #{status} where user_id = #{userId}
			</update>

			<update id="updateUserAvatar" parameterType="SysUser">
			<update id="updateUserAvatar" parameterType="com.aps.system.api.domain.SysUser">
			update sys_user set avatar = #{avatar} where user_name = #{userName}
			</update>

			<update id="resetUserPwd" parameterType="SysUser">
			<update id="resetUserPwd" parameterType="com.aps.system.api.domain.SysUser">
			update sys_user set password = #{password} where user_name = #{userName}
			</update>