From 54aff4794f199c40323e8704f660819b73fea768 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 400ae9a..e3a4e6e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -88,9 +88,12 @@
         select id,
                account,
                name,
-               name_en
+               name_en,
+               status
         from user u
-        where depart_lims_id = (select u2.depart_lims_id
+        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})
     </select>

--
Gitblit v1.9.3