|
|
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="leader" column="leader" />
|
|
|
<result property="status" column="dept_status" />
|
|
|
<result property="areaId" column="area_id" />
|
|
|
+ <result property="areaName" column="area_name" />
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap id="RoleResult" type="com.boman.domain.SysRole">
|
|
|
@@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<sql id="selectUserVo">
|
|
|
select u.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.union_id, u.open_id,u.grid_id,
|
|
|
- d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.area_id,
|
|
|
+ d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.area_id,d.area_name
|
|
|
r.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.id
|
tjf