From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期六, 26 八月 2023 13:30:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java index ba21890..27aa78b 100644 --- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java +++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java @@ -1,7 +1,12 @@ package com.yuanchu.limslaboratory.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.pojo.User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; /** * <p> @@ -12,5 +17,11 @@ * @since 2023-07-07 */ public interface UserMapper extends BaseMapper<User> { + Map<String, String> selectUserByUserId(int userId); + + IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status); + + List<Map<String,Object>> selectUser(); + } -- Gitblit v1.9.3