From 3b92cf3f9cd038c446e390aab18e759b0463d24a Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 13 三月 2025 09:08:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 5 +++++ 1 files changed, 5 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..a463ca3 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,9 @@ User getUserNow(@Param("userId") int userId); SysUserVO selectUserInfo(Long userId); + + String seldepLimsId(int depLimsId); + + List<Map<String, Object>> getLaboratoryPersonList(String laboratory); } -- Gitblit v1.9.3