|
|
@@ -24,6 +24,7 @@ |
|
|
|
<result property="updateBy" column="update_by"/> |
|
|
|
<result property="updateTime" column="update_time"/> |
|
|
|
<result property="remark" column="remark"/> |
|
|
|
<result property="joinedDate" column="joined_date"/> |
|
|
|
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/> |
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> |
|
|
|
</resultMap> |
|
|
@@ -77,7 +78,8 @@ |
|
|
|
r.role_key, |
|
|
|
r.role_sort, |
|
|
|
r.data_scope, |
|
|
|
r.status as role_status |
|
|
|
r.status as role_status, |
|
|
|
u.joined_date |
|
|
|
from sys_user u |
|
|
|
left join sys_dept d on u.dept_id = d.dept_id |
|
|
|
left join sys_user_role sur on u.user_id = sur.user_id |