正在显示
1 个修改的文件
包含
42 行增加
和
41 行删除
| @@ -4,50 +4,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -4,50 +4,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | 4 | "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
| 5 | <mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> | 5 | <mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> |
| 6 | 6 | ||
| 7 | - <resultMap type="SysUser" id="SysUserResult"> | ||
| 8 | - <id property="userId" column="user_id" /> | ||
| 9 | - <result property="deptId" column="dept_id" /> | ||
| 10 | - <result property="userName" column="user_name" /> | ||
| 11 | - <result property="nickName" column="nick_name" /> | ||
| 12 | - <result property="email" column="email" /> | ||
| 13 | - <result property="phonenumber" column="phonenumber" /> | ||
| 14 | - <result property="sex" column="sex" /> | ||
| 15 | - <result property="avatar" column="avatar" /> | ||
| 16 | - <result property="password" column="password" /> | ||
| 17 | - <result property="status" column="status" /> | ||
| 18 | - <result property="delFlag" column="del_flag" /> | ||
| 19 | - <result property="loginIp" column="login_ip" /> | ||
| 20 | - <result property="loginDate" column="login_date" /> | ||
| 21 | - <result property="createBy" column="create_by" /> | ||
| 22 | - <result property="createTime" column="create_time" /> | ||
| 23 | - <result property="updateBy" column="update_by" /> | ||
| 24 | - <result property="updateTime" column="update_time" /> | ||
| 25 | - <result property="remark" column="remark" /> | ||
| 26 | - <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" /> | ||
| 27 | - <collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> | ||
| 28 | - </resultMap> | ||
| 29 | - | ||
| 30 | - <resultMap id="deptResult" type="SysDept"> | ||
| 31 | - <id property="deptId" column="dept_id" /> | ||
| 32 | - <result property="parentId" column="parent_id" /> | ||
| 33 | - <result property="deptName" column="dept_name" /> | ||
| 34 | - <result property="orderNum" column="order_num" /> | ||
| 35 | - <result property="leader" column="leader" /> | ||
| 36 | - <result property="status" column="dept_status" /> | ||
| 37 | - </resultMap> | ||
| 38 | - | ||
| 39 | - <resultMap id="RoleResult" type="SysRole"> | ||
| 40 | - <id property="roleId" column="role_id" /> | ||
| 41 | - <result property="roleName" column="role_name" /> | ||
| 42 | - <result property="roleKey" column="role_key" /> | ||
| 43 | - <result property="roleSort" column="role_sort" /> | ||
| 44 | - <result property="dataScope" column="data_scope" /> | ||
| 45 | - <result property="status" column="role_status" /> | ||
| 46 | - </resultMap> | 7 | + <resultMap type="SysUser" id="SysUserResult"> |
| 8 | + <id property="userId" column="user_id" /> | ||
| 9 | + <result property="deptId" column="dept_id" /> | ||
| 10 | + <result property="userName" column="user_name" /> | ||
| 11 | + <result property="nickName" column="nick_name" /> | ||
| 12 | + <result property="email" column="email" /> | ||
| 13 | + <result property="phonenumber" column="phonenumber" /> | ||
| 14 | + <result property="sex" column="sex" /> | ||
| 15 | + <result property="avatar" column="avatar" /> | ||
| 16 | + <result property="password" column="password" /> | ||
| 17 | + <result property="status" column="status" /> | ||
| 18 | + <result property="delFlag" column="del_flag" /> | ||
| 19 | + <result property="loginIp" column="login_ip" /> | ||
| 20 | + <result property="loginDate" column="login_date" /> | ||
| 21 | + <result property="createBy" column="create_by" /> | ||
| 22 | + <result property="createTime" column="create_time" /> | ||
| 23 | + <result property="updateBy" column="update_by" /> | ||
| 24 | + <result property="updateTime" column="update_time" /> | ||
| 25 | + <result property="remark" column="remark" /> | ||
| 26 | + <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" /> | ||
| 27 | + <collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> | ||
| 28 | + </resultMap> | ||
| 29 | + | ||
| 30 | + <resultMap id="deptResult" type="SysDept"> | ||
| 31 | + <id property="deptId" column="dept_id" /> | ||
| 32 | + <result property="parentId" column="parent_id" /> | ||
| 33 | + <result property="deptName" column="dept_name" /> | ||
| 34 | + <result property="ancestors" column="ancestors" /> | ||
| 35 | + <result property="orderNum" column="order_num" /> | ||
| 36 | + <result property="leader" column="leader" /> | ||
| 37 | + <result property="status" column="dept_status" /> | ||
| 38 | + </resultMap> | ||
| 39 | + | ||
| 40 | + <resultMap id="RoleResult" type="SysRole"> | ||
| 41 | + <id property="roleId" column="role_id" /> | ||
| 42 | + <result property="roleName" column="role_name" /> | ||
| 43 | + <result property="roleKey" column="role_key" /> | ||
| 44 | + <result property="roleSort" column="role_sort" /> | ||
| 45 | + <result property="dataScope" column="data_scope" /> | ||
| 46 | + <result property="status" column="role_status" /> | ||
| 47 | + </resultMap> | ||
| 47 | 48 | ||
| 48 | <sql id="selectUserVo"> | 49 | <sql id="selectUserVo"> |
| 49 | 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, | 50 | 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, |
| 50 | - d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, | 51 | + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, |
| 51 | r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status | 52 | r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status |
| 52 | from sys_user u | 53 | from sys_user u |
| 53 | left join sys_dept d on u.dept_id = d.dept_id | 54 | left join sys_dept d on u.dept_id = d.dept_id |
-
请 注册 或 登录 后发表评论