|
|
@@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="deptId" column="dept_id" />
|
|
|
<result property="userName" column="user_name" />
|
|
|
<result property="nickName" column="nick_name" />
|
|
|
+ <result property="postName" column="post_name" />
|
|
|
+ <result property="userType" column="user_type" />
|
|
|
<result property="email" column="email" />
|
|
|
<result property="phonenumber" column="phonenumber" />
|
|
|
<result property="sex" column="sex" />
|
|
|
@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<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="SysDept" resultMap="deptResult" />-->
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
</resultMap>
|
|
|
|
|
|
@@ -45,46 +47,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="dataScope" column="data_scope" />
|
|
|
<result property="status" column="role_status" />
|
|
|
</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,
|
|
|
- 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
|
|
|
- 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
|
|
|
- </sql>
|
|
|
-
|
|
|
|
|
|
- <select id="selectUserListBaseOrg" 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 sys_user u
|
|
|
- inner join sys_user_dep ud on u.user_id=ud.user_id
|
|
|
- inner join sys_user_dep ud2 on u.user_id=ud2.user_id
|
|
|
- inner join sys_dept d on ud2.dep_id = d.dept_id and d.dep_type='base'
|
|
|
- where u.del_flag = '0'
|
|
|
+ <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
+ select u.user_id, u.dept_id, u.nick_name,u.post_name,u.user_type, 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,
|
|
|
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
|
+ 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 ur.role_id = r.role_id
|
|
|
+ where 1=1
|
|
|
+ and u.del_flag = '0' /*查询未删除的数据*/
|
|
|
+ and d.del_flag = '0' /*查询未删除的数据*/
|
|
|
+ and r.del_flag = '0' /*查询未删除的数据*/
|
|
|
<if test="userId != null and userId != 0">
|
|
|
AND u.user_id = #{userId}
|
|
|
- </if>
|
|
|
- <if test="userName==null and userId==null and status==null and phonenumber==null and params.beginTime==null and params.endTime==null and deptId==null and deptIds != null and deptIds.length>0">
|
|
|
- and (
|
|
|
-
|
|
|
- ud.dep_id in
|
|
|
- <foreach collection="deptIds" item="depId" open="(" separator="," close=")">
|
|
|
- #{depId}
|
|
|
- </foreach>
|
|
|
-
|
|
|
- or ud.dep_id in (select d4.dept_id from sys_dept d3 left join sys_dept d4 on d4.ancestors like CONCAT(d3.ancestors,'%') where d3.parent_id in
|
|
|
- <foreach collection="deptIds" item="depId" open="(" separator="," close=")">
|
|
|
- #{depId}
|
|
|
- </foreach>
|
|
|
- ) )
|
|
|
-
|
|
|
-
|
|
|
</if>
|
|
|
<if test="userName != null and userName != ''">
|
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
|
</if>
|
|
|
+ <if test="nickName != null and nickName != ''">
|
|
|
+ AND u.nick_name like concat('%', #{nickName}, '%')
|
|
|
+ </if>
|
|
|
<if test="status != null and status != ''">
|
|
|
AND u.status = #{status}
|
|
|
</if>
|
|
|
@@ -98,22 +81,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
|
|
|
</if>
|
|
|
<if test="deptId != null ">
|
|
|
- and ud.dep_id = #{deptId}
|
|
|
- -- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
|
|
|
- </if>
|
|
|
+ and u.dep_id = #{deptId}
|
|
|
+ -- </if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
-
|
|
|
- group by 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
|
|
|
</select>
|
|
|
|
|
|
+
|
|
|
+ <sql id="selectUserVo">
|
|
|
+ select u.user_id, u.dept_id, u.user_name, u.nick_name,u.post_name,u.user_type, 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,
|
|
|
+ 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
|
|
|
+ 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
|
|
|
+ </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 sys_user u
|
|
|
+ <select id="selectUserListBaseOrg" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
+ select u.user_id, u.dept_id, u.nick_name,u.post_name,u.user_type, 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
|
|
|
inner join sys_user_dep ud on u.user_id=ud.user_id
|
|
|
- left join sys_dept d on u.dept_id = d.dept_id
|
|
|
-
|
|
|
+ inner join sys_user_dep ud2 on u.user_id=ud2.user_id
|
|
|
+ inner join sys_dept d on ud2.dep_id = d.dept_id and d.dep_type='base'
|
|
|
where u.del_flag = '0'
|
|
|
<if test="userId != null and userId != 0">
|
|
|
AND u.user_id = #{userId}
|
|
|
@@ -121,12 +111,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="userName==null and userId==null and status==null and phonenumber==null and params.beginTime==null and params.endTime==null and deptId==null and deptIds != null and deptIds.length>0">
|
|
|
and (
|
|
|
|
|
|
- ud.dep_id in
|
|
|
+ ud.dep_id in
|
|
|
<foreach collection="deptIds" item="depId" open="(" separator="," close=")">
|
|
|
#{depId}
|
|
|
</foreach>
|
|
|
|
|
|
- or ud.dep_id in (select d4.dept_id from sys_dept d3 left join sys_dept d4 on d4.ancestors like CONCAT(d3.ancestors,'%') where d3.parent_id in
|
|
|
+ or ud.dep_id in (select d4.dept_id from sys_dept d3 left join sys_dept d4 on d4.ancestors like CONCAT(d3.ancestors,'%') where d3.parent_id in
|
|
|
<foreach collection="deptIds" item="depId" open="(" separator="," close=")">
|
|
|
#{depId}
|
|
|
</foreach>
|
|
|
@@ -151,16 +141,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
<if test="deptId != null ">
|
|
|
and ud.dep_id = #{deptId}
|
|
|
--- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
|
|
|
+ -- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
|
|
|
group by 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
|
|
|
</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
|
|
|
+ select distinct u.user_id, u.dept_id, u.user_name,u.post_name,u.user_type, 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
|
|
|
@@ -177,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</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
|
|
|
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.post_name,u.user_type, 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
|
|
|
@@ -222,6 +214,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<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="postName != null and postName != ''">post_name,</if>
|
|
|
+ <if test="userType != null and userType != ''">user_type,</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>
|
|
|
@@ -236,6 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<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="postName != null and postName != ''">#{postName},</if>
|
|
|
+ <if test="userType != null and userType != ''">#{userType},</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>
|
|
|
@@ -253,6 +249,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<set>
|
|
|
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
|
|
|
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
|
|
|
+ <if test="postName != null and postName != ''">post_name = #{postName},</if>
|
|
|
+ <if test="userType != null and userType != ''">user_type = #{userType},</if>
|
|
|
<if test="email != null ">email = #{email},</if>
|
|
|
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
|
|
|
<if test="sex != null and sex != ''">sex = #{sex},</if>
|
wangwei