|
|
|
@ -31,12 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
|
|
<resultMap id="deptResult" type="SysDept"> |
|
|
|
|
<id property="deptId" column="dept_id" /> |
|
|
|
|
<result property="parentId" column="parent_id" /> |
|
|
|
|
<result property="deptName" column="dept_name" /> |
|
|
|
|
<result property="orderNum" column="order_num" /> |
|
|
|
|
<result property="leader" column="leader" /> |
|
|
|
|
<result property="status" column="dept_status" /> |
|
|
|
|
<id property="deptId" column="dept_id" /> |
|
|
|
|
<result property="parentId" column="parent_id" /> |
|
|
|
|
<result property="deptName" column="dept_name" /> |
|
|
|
|
<result property="ancestors" column="ancestors" /> |
|
|
|
|
<result property="orderNum" column="order_num" /> |
|
|
|
|
<result property="leader" column="leader" /> |
|
|
|
|
<result property="status" column="dept_status" /> |
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
|
|
<resultMap id="RoleResult" type="SysRole"> |
|
|
|
@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
|
|
|
|
<sql id="selectUserVo"> |
|
|
|
|
select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark, |
|
|
|
|
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, |
|
|
|
|
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 |
|
|
|
|