From 652db871507244a5838fc6b36d9b9771b527ad61 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 25 九月 2025 11:56:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 8100356..323b429 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -172,7 +172,9 @@ select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar, u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.code, u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack + ,d.dept_name AS deptName from sys_user u + left join t_dept d on u.dept_id = d.id WHERE u.del_flag = 0 </select> <select id="selectCount" resultType="java.lang.Integer"> -- Gitblit v1.7.1