From e9f29cd1471a25f48fbc7e929a11710984b1acef Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 01 六月 2022 13:03:59 +0800 Subject: [PATCH] update hutool 5.8.1 => 5.8.2 --- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index d4fd23f..292481c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -32,6 +32,7 @@ <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"/> @@ -66,6 +67,7 @@ u.remark, d.dept_id, d.parent_id, + d.ancestors, d.dept_name, d.order_num, d.leader, @@ -83,7 +85,7 @@ </sql> <select id="selectPageUserList" resultMap="SysUserResult"> - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, + select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -91,7 +93,7 @@ </select> <select id="selectUserList" resultMap="SysUserResult"> - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, + select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id -- Gitblit v1.9.3