|
|
@@ -55,7 +55,8 @@
|
|
|
u.wechat, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by,
|
|
|
u.create_time, u.remark,u.birthday,u.post, dict.dict_label,
|
|
|
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
|
|
|
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
|
|
|
+ u.post, dict.dict_label as post_text
|
|
|
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
|
|
|
@@ -64,12 +65,7 @@
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.real_name, u.email, u.avatar, u.phone, u.wechat,
|
|
|
- u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,
|
|
|
- u.birthday, u.remark, d.dept_name, d.leader, u.post, dict.dict_label as post_text
|
|
|
- from sys_user u
|
|
|
- left join sys_dept d on u.dept_id = d.dept_id
|
|
|
- LEFT JOIN sys_dict_data dict ON (u.post = dict.dict_value AND dict.dict_type = 'postType')
|
|
|
+ <include refid="selectUserVo"/>
|
|
|
where u.del_flag = '0'
|
|
|
<if test="userId != null and userId != 0">
|
|
|
AND u.user_id = #{userId}
|