From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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 0f3eafd..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
@@ -1,7 +1,14 @@
package com.ruoyi.system.mapper;
+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;
/**
* 鐢ㄦ埛淇℃伅琛�
@@ -11,5 +18,41 @@
*/
public interface UserMapper extends BaseMapper<User> {
+ /**
+ * 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
+ * @param ew
+ * @param type
+ * @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);
+
+ 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