From 1bc97562ccf38d0b6235f2efdba35eb68f1f208b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 10 十一月 2025 22:06:55 +0800
Subject: [PATCH] fix:修复 sysuser
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 11 ++++-------
ruoyi-admin/src/main/resources/application.yml | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a29e877..1cc4eb0 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -58,7 +58,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: dev
+ active: prod
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index dbe2adc..3f59bac 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -254,7 +254,7 @@
<select id="selectUsersByBranchDeptIds" resultMap="SysUserResult">
SELECT DISTINCT
u.user_id, u.dept_id, u.user_name, u.nick_name, u.email,
- u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
+ u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.create_time,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
FROM sys_user u
@@ -263,19 +263,16 @@
LEFT JOIN sys_role r ON r.role_id = ur.role_id
WHERE u.del_flag = '0'
AND u.status = '0'
- AND u.dept_id IN (
- -- 鏌ヨ鍒嗗叕鍙稿強鍏舵墍鏈夊瓙閮ㄩ棬
+ AND u.dept_id IN (
SELECT t.dept_id
FROM sys_dept t
WHERE t.del_flag = '0'
- AND (
- -- 鍒嗗叕鍙告湰韬�
+ AND (
t.dept_id IN
<foreach collection="branchDeptIds" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
- OR
- -- 鍒嗗叕鍙哥殑瀛愰儴闂紙閫氳繃ancestors瀛楁鍖归厤锛�
+ OR
<foreach collection="branchDeptIds" item="deptId" open="(" separator=" OR " close=")">
find_in_set(#{deptId}, t.ancestors) > 0
</foreach>
--
Gitblit v1.9.1