|
|
@@ -51,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
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 public.sys_user u
|
|
|
- left join public.sys_dept d on u.dept_id = d.dept_id
|
|
|
- left join public.sys_user_role ur on u.user_id = ur.user_id
|
|
|
- left join public.sys_role r on r.role_id = ur.role_id
|
|
|
+ from app_user.sys_user u
|
|
|
+ left join app_user.sys_dept d on u.dept_id = d.dept_id
|
|
|
+ left join app_user.sys_user_role ur on u.user_id = ur.user_id
|
|
|
+ left join app_user.sys_role r on r.role_id = ur.role_id
|
|
|
</sql>
|
|
|
|
|
|
<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.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from public.sys_user u
|
|
|
- left join public.sys_dept d on u.dept_id = d.dept_id
|
|
|
+ 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 app_user.sys_user u
|
|
|
+ left join app_user.sys_dept d on u.dept_id = d.dept_id
|
|
|
where u.del_flag = '0'
|
|
|
<if test="userId != null and userId != 0">
|
|
|
AND u.user_id = #{userId}
|
|
|
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND TO_CHAR(u.create_time, 'YYYYMMDD') <= TO_CHAR(#{params.endTime}::TIMESTAMP, 'YYYYMMDD')
|
|
|
</if>
|
|
|
<if test="deptId != null and deptId != 0">
|
|
|
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id from public.sys_dept t WHERE POSITION(',' || #{deptId} || ',' IN ',' || ancestors || ',') > 0 ))
|
|
|
+ AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id from app_user.sys_dept t WHERE POSITION(',' || #{deptId} || ',' IN ',' || ancestors || ',') > 0 ))
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
@@ -88,10 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<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 public.sys_user u
|
|
|
- left join public.sys_dept d on u.dept_id = d.dept_id
|
|
|
- left join public.sys_user_role ur on u.user_id = ur.user_id
|
|
|
- left join public.sys_role r on r.role_id = ur.role_id
|
|
|
+ from app_user.sys_user u
|
|
|
+ left join app_user.sys_dept d on u.dept_id = d.dept_id
|
|
|
+ left join app_user.sys_user_role ur on u.user_id = ur.user_id
|
|
|
+ left join app_user.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}, '%')
|
|
|
@@ -105,12 +105,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<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 public.sys_user u
|
|
|
- left join public.sys_dept d on u.dept_id = d.dept_id
|
|
|
- left join public.sys_user_role ur on u.user_id = ur.user_id
|
|
|
- left join public.sys_role r on r.role_id = ur.role_id
|
|
|
+ from app_user.sys_user u
|
|
|
+ left join app_user.sys_dept d on u.dept_id = d.dept_id
|
|
|
+ left join app_user.sys_user_role ur on u.user_id = ur.user_id
|
|
|
+ left join app_user.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 public.sys_user u inner join public.sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
|
|
|
+ and u.user_id not in (select u.user_id from app_user.sys_user u inner join app_user.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>
|
|
|
@@ -132,19 +132,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</select>
|
|
|
|
|
|
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
|
|
|
- select user_id, user_name from public.sys_user where user_name = #{userName} and del_flag = '0' limit 1
|
|
|
+ select user_id, user_name from app_user.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 public.sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
|
|
|
+ select user_id, phonenumber from app_user.sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
|
|
|
</select>
|
|
|
|
|
|
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
|
|
|
- select user_id, email from public.sys_user where email = #{email} and del_flag = '0' limit 1
|
|
|
+ select user_id, email from app_user.sys_user where email = #{email} and del_flag = '0' limit 1
|
|
|
</select>
|
|
|
|
|
|
<insert id="insertUser" parameterType="SysUser">
|
|
|
- insert into public.sys_user(
|
|
|
+ insert into app_user.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>
|
|
|
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</insert>
|
|
|
|
|
|
<update id="updateUser" parameterType="SysUser">
|
|
|
- update public.sys_user
|
|
|
+ update app_user.sys_user
|
|
|
<set>
|
|
|
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
|
|
|
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
|
|
|
@@ -198,23 +198,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</update>
|
|
|
|
|
|
<update id="updateUserStatus" parameterType="SysUser">
|
|
|
- update public.sys_user set status = #{status} where user_id = #{userId}
|
|
|
+ update app_user.sys_user set status = #{status} where user_id = #{userId}
|
|
|
</update>
|
|
|
|
|
|
<update id="updateUserAvatar" parameterType="SysUser">
|
|
|
- update public.sys_user set avatar = #{avatar} where user_id = #{userId}
|
|
|
+ update app_user.sys_user set avatar = #{avatar} where user_id = #{userId}
|
|
|
</update>
|
|
|
|
|
|
<update id="resetUserPwd" parameterType="SysUser">
|
|
|
- update public.sys_user set pwd_update_date = CURRENT_TIMESTAMP, password = #{password} where user_id = #{userId}
|
|
|
+ update app_user.sys_user set pwd_update_date = CURRENT_TIMESTAMP, password = #{password} where user_id = #{userId}
|
|
|
</update>
|
|
|
|
|
|
<delete id="deleteUserById" parameterType="Long">
|
|
|
- update public.sys_user set del_flag = '2' where user_id = #{userId}
|
|
|
+ update app_user.sys_user set del_flag = '2' where user_id = #{userId}
|
|
|
</delete>
|
|
|
|
|
|
<delete id="deleteUserByIds" parameterType="Long">
|
|
|
- update public.sys_user set del_flag = '2' where user_id in
|
|
|
+ update app_user.sys_user set del_flag = '2' where user_id in
|
|
|
<foreach collection="array" item="userId" open="(" separator="," close=")">
|
|
|
#{userId}
|
|
|
</foreach>
|