From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index 6bfa898..f0dc2b3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鐢ㄦ埛淇℃伅琛�
@@ -22,5 +23,26 @@
      * @return
      */
     List<User> selectUserCondition(@Param("ew") QueryWrapper<User> ew, @Param("type") String type);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛閮ㄩ棬
+     * @param userId
+     * @return
+     */
+    String selectUserDepartmentLimsName(@Param("userId") Integer userId);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛鍜岄儴闂�
+     * @param participant
+     * @return
+     */
+    List<Map<String, String>> selectNameAnddepartment(@Param("participant") String participant);
+
+    /**
+     * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+     * @param userId
+     * @return
+     */
+    User getUserNow(@Param("userId") int userId);
 }
 

--
Gitblit v1.9.3