From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001 From: lxp <1928192722@qq.com> Date: 星期六, 15 三月 2025 10:49:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 8 ++++++++ 1 files changed, 8 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 157d946..5e11563 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 com.ruoyi.common.core.vo.SysUserVO; import org.apache.ibatis.annotations.Param; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -47,5 +48,12 @@ User getUserNow(@Param("userId") int userId); SysUserVO selectUserInfo(Long userId); + + String seldepLimsId(int depLimsId); + + List<Map<String,Object>> getPersonList(String laboratory); + + List<Map<String, Object>> getLaboratoryPersonList(String laboratory); + } -- Gitblit v1.9.3