From b999398ae9b2719d2db15716dd353f7a3855d59e Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 07 四月 2025 17:33:55 +0800 Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 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 f0dc2b3..d78dcd6 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,10 +3,12 @@ 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.system.domain.vo.UserVo; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; +import java.util.Set; /** * 鐢ㄦ埛淇℃伅琛� @@ -43,6 +45,22 @@ * @param userId * @return */ - User getUserNow(@Param("userId") int userId); + UserVo getUserNow(@Param("userId") int userId); + + /** + * 鑾峰彇妫�娴嬩汉鍛樹俊鎭� + * @return + */ + List<User> selectQualityUserList(); + + /** + * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� + * @param userId + * @return + */ + List<User> selectDepartmentLimsUserList(@Param("userId") Integer userId); + + + List<User> selectByNames(@Param("names") Set<String> names); } -- Gitblit v1.9.3