From 7787f57521297df847bfd5f2b9af410b3fdac67e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 7db5013..7075623 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -114,11 +114,24 @@
name_en,
status
from user u
- where depart_lims_id is not null
- and depart_lims_id != ''
- and depart_lims_id = (select u2.depart_lims_id
- from user u2
- where u2.id = #{userId})
+ where (
+ (depart_lims_id is not null
+ and depart_lims_id != ''
+ and depart_lims_id = (select u2.depart_lims_id
+ from user u2
+ where u2.id = #{userId}))
+ or
+ (
+ ((select u3.depart_lims_id
+ from user u3
+ where u3.id = #{userId}) is null
+ or (select u3.depart_lims_id
+ from user u3
+ where u3.id = #{userId}) = '')
+ and u.status = '0'
+ and u.del_flag = '0'
+ )
+ )
</select>
</mapper>
--
Gitblit v1.9.3