From 8246ec51e9cf0fdb37a76bc62cac4ac2b3ffc893 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 14 三月 2025 14:49:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 9 +++++++++
1 files changed, 9 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 c320557..5f7d242 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
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.User;
+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;
@@ -45,5 +47,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