|
|
@@ -73,26 +73,105 @@
|
|
|
|
|
|
<!--2.6弃用-->
|
|
|
<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,u.user_type,
|
|
|
- d.dept_id, d.parent_id, 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,
|
|
|
- u.major,u.major_id, u.grade, u.category, u.tutor_user_id, u.position, u.nature, u.signature,
|
|
|
- u.card_num,u.wechat_id,u.education,u.nationality,u.addr,u.work_status,u.date_birth,
|
|
|
- ut.nick_name tutorUserName,u.is_check
|
|
|
+ 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,
|
|
|
+ u.user_type,
|
|
|
+ d.dept_id,
|
|
|
+ d.parent_id,
|
|
|
+ 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,
|
|
|
+ u.major,
|
|
|
+ u.major_id,
|
|
|
+ u.grade,
|
|
|
+ u.category,
|
|
|
+ u.tutor_user_id,
|
|
|
+ u.position,
|
|
|
+ u.nature,
|
|
|
+ u.signature,
|
|
|
+ u.card_num,
|
|
|
+ u.wechat_id,
|
|
|
+ u.education,
|
|
|
+ u.nationality,
|
|
|
+ u.addr,
|
|
|
+ u.work_status,
|
|
|
+ u.date_birth,
|
|
|
+ ut.nick_name tutorUserName,
|
|
|
+ u.is_check
|
|
|
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
|
|
|
- left join sys_user ut on ut.user_id = u.tutor_user_id
|
|
|
+ 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
|
|
|
+ left join sys_user ut on ut.user_id = u.tutor_user_id
|
|
|
</sql>
|
|
|
|
|
|
<sql id="selectUserNewVo">
|
|
|
- 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,u.user_type,
|
|
|
- d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
|
- sm.`major_name` major, u.grade, u.category, u.tutor_user_id, u.position, u.nature, u.signature,
|
|
|
- u.card_num,u.card_num_simple,u.wechat_id,u.education,u.nationality,u.addr,u.work_status,u.date_birth,
|
|
|
- ut.nick_name tutorUserName,u.is_check,
|
|
|
- uf.face_img,sc.class_name,u.major_id,u.signature,pt.`post_name` positionName
|
|
|
+ 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,
|
|
|
+ u.user_type,
|
|
|
+ d.dept_id,
|
|
|
+ d.parent_id,
|
|
|
+ d.dept_name,
|
|
|
+ d.order_num,
|
|
|
+ d.leader,
|
|
|
+ d.status as dept_status,
|
|
|
+ sm.`major_name` major,
|
|
|
+ u.grade,
|
|
|
+ u.category,
|
|
|
+ u.tutor_user_id,
|
|
|
+ u.position,
|
|
|
+ u.nature,
|
|
|
+ u.signature,
|
|
|
+ u.card_num,
|
|
|
+ u.card_num_simple,
|
|
|
+ u.wechat_id,
|
|
|
+ u.education,
|
|
|
+ u.nationality,
|
|
|
+ u.addr,
|
|
|
+ u.work_status,
|
|
|
+ u.date_birth,
|
|
|
+ ut.nick_name tutorUserName,
|
|
|
+ u.is_check,
|
|
|
+ uf.face_img,
|
|
|
+ sc.class_name,
|
|
|
+ u.major_id,
|
|
|
+ u.signature,
|
|
|
+ pt.`post_name` positionName
|
|
|
from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join sys_user ut on ut.user_id = u.tutor_user_id
|
|
|
@@ -178,7 +257,7 @@
|
|
|
AND u.major like concat('%', #{major}, '%')
|
|
|
</if>
|
|
|
<if test="majorId != null and majorId != ''">
|
|
|
- AND u.major_id = #{majorId}
|
|
|
+ AND u.major_id = #{majorId}
|
|
|
</if>
|
|
|
<if test="searchValue != null and searchValue != ''">
|
|
|
AND
|
|
|
@@ -201,16 +280,16 @@
|
|
|
AND u.category like concat('%', #{category}, '%')
|
|
|
</if>
|
|
|
<if test="tutorUserId != null">
|
|
|
- AND u.tutor_user_id = #{tutorUserId}
|
|
|
+ AND u.tutor_user_id = #{tutorUserId}
|
|
|
</if>
|
|
|
<if test="nature != null and nature != ''">
|
|
|
- AND u.nature = #{nature}
|
|
|
+ AND u.nature = #{nature}
|
|
|
</if>
|
|
|
<if test="position != null and position != ''">
|
|
|
- AND u.position = #{position}
|
|
|
+ AND u.position = #{position}
|
|
|
</if>
|
|
|
<if test="isCheck != null">
|
|
|
- AND u.is_check = #{isCheck}
|
|
|
+ AND u.is_check = #{isCheck}
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
@@ -221,22 +300,23 @@
|
|
|
u.create_time DESC
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectUserListByDeptIds" resultMap="SysUserResult">
|
|
|
+ <select id="selectUserListByDeptIds" resultMap="SysUserResult">
|
|
|
select u.user_id, u.dept_id, u.nick_name, u.user_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,
|
|
|
u.card_num,u.wechat_id,u.education,u.nationality,u.addr,u.work_status,u.date_birth
|
|
|
from
|
|
|
sys_user u
|
|
|
where u.del_flag = '0'
|
|
|
- and u.status = '0'
|
|
|
- and u.dept_id in
|
|
|
- <foreach collection="array" item="deptId" open="(" separator="," close=")">
|
|
|
- #{deptId}
|
|
|
- </foreach>
|
|
|
+ and u.status = '0'
|
|
|
+ and u.dept_id in
|
|
|
+ <foreach collection="array" item="deptId" open="(" separator="," close=")">
|
|
|
+ #{deptId}
|
|
|
+ </foreach>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectAllocatedList" parameterType="com.zd.model.entity.SysUser" resultMap="SysUserResult">
|
|
|
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.phonenumber, u.status, u.create_time, d.`dept_name`,
|
|
|
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.phonenumber, u.status,
|
|
|
+ u.create_time, d.`dept_name`,
|
|
|
u.card_num,u.wechat_id,u.education,u.nationality,u.addr,u.work_status,u.date_birth
|
|
|
from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
@@ -299,19 +379,54 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserCenterByUserName" parameterType="String" resultMap="SysUserResult">
|
|
|
- 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,u.user_type,
|
|
|
- d.dept_id, d.parent_id,
|
|
|
- CASE WHEN u.user_type='22' THEN d.dept_name ELSE concat(if((SELECT dt.dept_name FROM sys_dept dt WHERE dt.dept_id = d.parent_id) is null ,'',
|
|
|
- (SELECT concat(dt.dept_name,'-') FROM sys_dept dt WHERE dt.dept_id = d.parent_id)),d.dept_name) end dept_name,
|
|
|
- d.order_num, d.leader, d.status AS dept_status,
|
|
|
- CASE WHEN u.user_type='22' THEN sm.`major_name` else pt.`post_name` end major,
|
|
|
- u.grade,dd.`dict_label` category, u.tutor_user_id, u.position, u.nature, u.signature,
|
|
|
- u.card_num,u.wechat_id,
|
|
|
- case when u.user_type='22' then ed.`dict_label` else dd.`dict_label` end education,
|
|
|
- u.nationality,u.addr,u.work_status,u.date_birth,
|
|
|
- ut.nick_name tutorUserName,u.is_check,
|
|
|
- uf.face_img,sc.class_name,u.major_id,u.signature,pt.`post_name` positionName
|
|
|
+ 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,
|
|
|
+ u.user_type,
|
|
|
+ d.dept_id,
|
|
|
+ d.parent_id,
|
|
|
+ CASE
|
|
|
+ WHEN u.user_type = '22' THEN d.dept_name
|
|
|
+ ELSE concat(if((SELECT dt.dept_name FROM sys_dept dt WHERE dt.dept_id = d.parent_id) is null, '',
|
|
|
+ (SELECT concat(dt.dept_name, '-') FROM sys_dept dt WHERE dt.dept_id = d.parent_id)),
|
|
|
+ d.dept_name) end dept_name,
|
|
|
+ d.order_num,
|
|
|
+ d.leader,
|
|
|
+ d.status AS dept_status,
|
|
|
+ CASE WHEN u.user_type = '22' THEN sm.`major_name` else pt.`post_name` end major,
|
|
|
+ u.grade,
|
|
|
+ dd.`dict_label` category,
|
|
|
+ u.tutor_user_id,
|
|
|
+ u.position,
|
|
|
+ u.nature,
|
|
|
+ u.signature,
|
|
|
+ u.card_num,
|
|
|
+ u.wechat_id,
|
|
|
+ case when u.user_type = '22' then ed.`dict_label` else dd.`dict_label` end education,
|
|
|
+ u.nationality,
|
|
|
+ u.addr,
|
|
|
+ u.work_status,
|
|
|
+ u.date_birth,
|
|
|
+ ut.nick_name tutorUserName,
|
|
|
+ u.is_check,
|
|
|
+ uf.face_img,
|
|
|
+ sc.class_name,
|
|
|
+ u.major_id,
|
|
|
+ u.signature,
|
|
|
+ pt.`post_name` positionName
|
|
|
FROM sys_user u
|
|
|
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
|
|
|
LEFT JOIN sys_user ut ON ut.user_id = u.tutor_user_id
|
|
|
@@ -319,9 +434,10 @@
|
|
|
LEFT JOIN sys_class sc ON sc.id = u.grade
|
|
|
LEFT JOIN sys_major sm ON sm.id = u.major_id
|
|
|
LEFT JOIN sys_post pt ON pt.`post_id` = u.`position`
|
|
|
- LEFT JOIN sys_dict_data dd ON dd.`dict_value` = u.category AND dd.`dict_type`='professional'
|
|
|
- LEFT JOIN sys_dict_data ed ON ed.`dict_value` = u.education AND ed.`dict_type`='education'
|
|
|
- where u.user_name = #{userName} and u.del_flag = 0
|
|
|
+ LEFT JOIN sys_dict_data dd ON dd.`dict_value` = u.category AND dd.`dict_type` = 'professional'
|
|
|
+ LEFT JOIN sys_dict_data ed ON ed.`dict_value` = u.education AND ed.`dict_type` = 'education'
|
|
|
+ where u.user_name = #{userName}
|
|
|
+ and u.del_flag = 0
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
|
|
|
@@ -340,32 +456,54 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="checkUserNameUnique" parameterType="String" resultType="int">
|
|
|
- select count(1) from sys_user where user_name = #{userName} and del_flag=0 limit 1
|
|
|
- </select>
|
|
|
+ select count(1)
|
|
|
+ from sys_user
|
|
|
+ where user_name = #{userName}
|
|
|
+ and del_flag = 0 limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="checkUserNameUniqueNotOwn" parameterType="com.zd.model.entity.SysUser" resultType="int">
|
|
|
- select count(1) from sys_user where user_name = #{userName} and del_flag=0 and user_id != #{userId} limit 1
|
|
|
- </select>
|
|
|
+ select count(1)
|
|
|
+ from sys_user
|
|
|
+ where user_name = #{userName}
|
|
|
+ and del_flag = 0
|
|
|
+ and user_id != #{userId} limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="checkCardUnique" parameterType="com.zd.model.entity.SysUser" resultType="int">
|
|
|
- select count(1) from sys_user where card_num = #{cardNum} and del_flag=0 limit 1
|
|
|
- </select>
|
|
|
+ select count(1)
|
|
|
+ from sys_user
|
|
|
+ where card_num = #{cardNum}
|
|
|
+ and del_flag = 0 limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="checkCardSimpleUnique" parameterType="com.zd.model.entity.SysUser" resultType="int">
|
|
|
- select count(1) from sys_user where card_num_simple = #{cardNumSimple} and del_flag=0 and user_id != #{userId} limit 1
|
|
|
- </select>
|
|
|
+ select count(1)
|
|
|
+ from sys_user
|
|
|
+ where card_num_simple = #{cardNumSimple}
|
|
|
+ and del_flag = 0
|
|
|
+ and user_id != #{userId} 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 user_id, phonenumber
|
|
|
+ from sys_user
|
|
|
+ where phonenumber = #{phonenumber}
|
|
|
+ and del_flag = 0 limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="checkPhoneUniqueNotOwn" parameterType="com.zd.model.entity.SysUser" resultMap="SysUserResult">
|
|
|
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and user_name != #{userName} limit 1
|
|
|
- </select>
|
|
|
+ select user_id, phonenumber
|
|
|
+ from sys_user
|
|
|
+ where phonenumber = #{phonenumber}
|
|
|
+ and user_name != #{userName} limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
|
|
|
- select user_id, email from sys_user where email = #{email} limit 1
|
|
|
- </select>
|
|
|
+ select user_id, email
|
|
|
+ from sys_user
|
|
|
+ where email = #{email} limit 1
|
|
|
+ </select>
|
|
|
|
|
|
<select id="selectOption" resultType="java.util.Map">
|
|
|
select user_id userId, nick_name nickName,user_name userName from sys_user
|
|
|
@@ -438,14 +576,14 @@
|
|
|
AND u.category like concat('%', #{category}, '%')
|
|
|
</if>
|
|
|
<if test="tutorUserId != null">
|
|
|
- AND u.tutor_user_id = #{tutorUserId}
|
|
|
+ AND u.tutor_user_id = #{tutorUserId}
|
|
|
</if>
|
|
|
<if test="nature != null and nature != ''">
|
|
|
- AND u.nature = #{nature}
|
|
|
+ AND u.nature = #{nature}
|
|
|
</if>
|
|
|
|
|
|
<if test="isCheck != null">
|
|
|
- AND u.is_check = #{isCheck}
|
|
|
+ AND u.is_check = #{isCheck}
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
@@ -643,16 +781,22 @@
|
|
|
</update>
|
|
|
|
|
|
<update id="updateUserAvatar" parameterType="com.zd.model.entity.SysUser">
|
|
|
- update sys_user set avatar = #{avatar} where user_name = #{userName}
|
|
|
- </update>
|
|
|
+ update sys_user
|
|
|
+ set avatar = #{avatar}
|
|
|
+ where user_name = #{userName}
|
|
|
+ </update>
|
|
|
|
|
|
<update id="resetUserPwd" parameterType="com.zd.model.entity.SysUser">
|
|
|
- update sys_user set password = #{password} where user_name = #{userName}
|
|
|
- </update>
|
|
|
+ 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>
|
|
|
+ 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
|
|
|
@@ -661,7 +805,7 @@
|
|
|
</foreach>
|
|
|
</delete>
|
|
|
<select id="queryPhoneByIds" resultType="string">
|
|
|
- select phonenumber from sys_user
|
|
|
+ select phonenumber from sys_user
|
|
|
where user_id in
|
|
|
<foreach collection="array" item="id" open="(" separator="," close=")">
|
|
|
#{id}
|
|
|
@@ -670,7 +814,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="queryCardNumByIds" resultType="com.zd.model.entity.SysUser">
|
|
|
- select * from sys_user
|
|
|
+ select * from sys_user
|
|
|
where card_num_simple in
|
|
|
<foreach collection="array" item="cardNums" open="(" separator="," close=")">
|
|
|
#{cardNums}
|
|
|
@@ -738,16 +882,16 @@
|
|
|
AND u.category like concat('%', #{category}, '%')
|
|
|
</if>
|
|
|
<if test="tutorUserId != null">
|
|
|
- AND u.tutor_user_id = #{tutorUserId}
|
|
|
+ AND u.tutor_user_id = #{tutorUserId}
|
|
|
</if>
|
|
|
<if test="nature != null and nature != ''">
|
|
|
- AND u.nature = #{nature}
|
|
|
+ AND u.nature = #{nature}
|
|
|
</if>
|
|
|
<if test="position != null and position != ''">
|
|
|
- AND u.position = #{position}
|
|
|
+ AND u.position = #{position}
|
|
|
</if>
|
|
|
<if test="isCheck != null">
|
|
|
- AND u.is_check = #{isCheck}
|
|
|
+ AND u.is_check = #{isCheck}
|
|
|
</if>
|
|
|
|
|
|
</select>
|
|
|
@@ -793,7 +937,7 @@
|
|
|
AND u.user_id IN
|
|
|
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
|
|
|
</if>
|
|
|
- <if test="deptIds !=null and deptIds.size >0" >
|
|
|
+ <if test="deptIds !=null and deptIds.size >0">
|
|
|
AND u.dept_id IN
|
|
|
<foreach item="item" collection="deptIds" separator="," open="(" close=")" index="">'${item}'</foreach>
|
|
|
</if>
|
|
|
@@ -807,22 +951,25 @@
|
|
|
AND u.category like concat('%', #{category}, '%')
|
|
|
</if>
|
|
|
<if test="tutorUserId != null">
|
|
|
- AND u.tutor_user_id = #{tutorUserId}
|
|
|
+ AND u.tutor_user_id = #{tutorUserId}
|
|
|
</if>
|
|
|
<if test="nature != null and nature != ''">
|
|
|
- AND u.nature = #{nature}
|
|
|
+ AND u.nature = #{nature}
|
|
|
</if>
|
|
|
<if test="position != null and position != ''">
|
|
|
- AND u.position = #{position}
|
|
|
+ AND u.position = #{position}
|
|
|
</if>
|
|
|
<if test="isCheck != null">
|
|
|
- AND u.is_check = #{isCheck}
|
|
|
+ AND u.is_check = #{isCheck}
|
|
|
</if>
|
|
|
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserInfoByCardNum" resultType="com.zd.model.entity.SysUser">
|
|
|
- SELECT user_id,nick_name,card_num,card_num_simple FROM sys_user u WHERE u.card_num_simple = #{cardNumSimple} and u.user_id != #{userId}
|
|
|
+ SELECT user_id, nick_name, card_num, card_num_simple
|
|
|
+ FROM sys_user u
|
|
|
+ WHERE u.card_num_simple = #{cardNumSimple}
|
|
|
+ and u.user_id != #{userId}
|
|
|
</select>
|
|
|
|
|
|
<select id="getSafeUserList" parameterType="com.zd.model.entity.SysUser" resultMap="SysUserResult">
|
|
|
@@ -837,21 +984,80 @@
|
|
|
|
|
|
|
|
|
<select id="oldCheckNewCard" resultMap="SysUserResult">
|
|
|
- select u.user_id, u.dept_id, u.nick_name, u.user_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,
|
|
|
- u.major_id, u.grade, u.tutor_user_id, u.position, p.post_name as positionName,
|
|
|
- u.nature,(select sc.class_name from sys_class sc where sc.id = u.grade) gradeName,
|
|
|
- u.card_num,u.wechat_id,u.nationality,u.addr,u.work_status,
|
|
|
- u.date_birth,d.dept_name, d.leader,u.department,
|
|
|
- u.education, u.user_type,sm.`major_name` major,
|
|
|
- ut.nick_name tutorUserName,u.is_check,date_format(u.create_time, '%Y-%m-%d') createTimeStr
|
|
|
- from
|
|
|
- sys_user u
|
|
|
- left join sys_dept d on u.dept_id = d.dept_id
|
|
|
- left join sys_user ut on ut.user_id = u.tutor_user_id
|
|
|
- left join sys_post p on u.position = p.post_id
|
|
|
- LEFT JOIN sys_major sm ON sm.id = u.major_id
|
|
|
+ select u.user_id,
|
|
|
+ u.dept_id,
|
|
|
+ u.nick_name,
|
|
|
+ u.user_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,
|
|
|
+ u.major_id,
|
|
|
+ u.grade,
|
|
|
+ u.tutor_user_id,
|
|
|
+ u.position,
|
|
|
+ p.post_name as positionName,
|
|
|
+ u.nature,
|
|
|
+ (select sc.class_name from sys_class sc where sc.id = u.grade) gradeName,
|
|
|
+ u.card_num,
|
|
|
+ u.wechat_id,
|
|
|
+ u.nationality,
|
|
|
+ u.addr,
|
|
|
+ u.work_status,
|
|
|
+ u.date_birth,
|
|
|
+ d.dept_name,
|
|
|
+ d.leader,
|
|
|
+ u.department,
|
|
|
+ u.education,
|
|
|
+ u.user_type,
|
|
|
+ sm.`major_name` major,
|
|
|
+ ut.nick_name tutorUserName,
|
|
|
+ u.is_check,
|
|
|
+ date_format(u.create_time, '%Y-%m-%d') createTimeStr
|
|
|
+ from sys_user u
|
|
|
+ left join sys_dept d on u.dept_id = d.dept_id
|
|
|
+ left join sys_user ut on ut.user_id = u.tutor_user_id
|
|
|
+ left join sys_post p on u.position = p.post_id
|
|
|
+ LEFT JOIN sys_major sm ON sm.id = u.major_id
|
|
|
where u.del_flag = '0'
|
|
|
- AND u.card_num IS NOT NULL AND u.`card_num_simple` IS NULL
|
|
|
+ AND u.card_num IS NOT NULL
|
|
|
+ AND u.`card_num_simple` IS NULL
|
|
|
</select>
|
|
|
+
|
|
|
+ <!--值班人员列表-->
|
|
|
+ <select id="selectUserDutyList" parameterType="com.zd.model.entity.SysUser" resultMap="SysUserResult">
|
|
|
+ select u.user_id, u.dept_id,d.dept_name, u.user_name, u.nick_name, u.avatar, u.phonenumber, u.sex,
|
|
|
+ u.status, u.del_flag,u.user_type
|
|
|
+ from
|
|
|
+ (
|
|
|
+ select w.user_id from lab_whitelist w
|
|
|
+ union all
|
|
|
+ select a.user_id from lab_security_apply a where a.valid_end_time> NOW() and audit_status=2
|
|
|
+ ) t
|
|
|
+ LEFT JOIN sys_user u on t.user_id=u.user_id
|
|
|
+ LEFT JOIN sys_dept d on d.dept_id = u.dept_id
|
|
|
+ <where>
|
|
|
+ <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) ))
|
|
|
+ </if>
|
|
|
+ <if test="nickName != null and nickName != ''">
|
|
|
+ AND u.nick_name = #{nickName}
|
|
|
+ </if>
|
|
|
+ <if test="userType != null and userType != ''">
|
|
|
+ AND u.user_type = #{userType}
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
+ <!-- 数据范围过滤 -->
|
|
|
+ ${params.dataScope}
|
|
|
+ </select>
|
|
|
+
|
|
|
</mapper>
|
xuxiaofei