From 5101e344b4ac9de94d0f18d8a501158be49221ff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 10:27:00 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 24a4f85..6487371 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -47,4 +47,17 @@
                  left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
         where find_in_set(u.id, #{participant})
     </select>
+
+    <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 -->
+    <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
+        select u.id,
+               c.company,
+               u.name,
+               c.code,
+               u.phone,
+               c.id departId
+        from user u
+                 left join custom c on u.company = c.id
+        where u.id = #{userId}
+    </select>
 </mapper>

--
Gitblit v1.9.3