From eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 3b9df69..3b7a54e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -4,16 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -54,7 +49,7 @@
* @param page
* @return
*/
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+ IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
/**
* 鐧诲綍鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅涓庣郴缁熻秴鏃舵椂闂存彁閱�
@@ -79,5 +74,10 @@
* 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
* @return
*/
- List<User> selectUser();
+ List<Map<String,Object>> selectUser();
+
+ /**
+ * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+ */
+ List<Map<String, Object>> getUserNameAndId();
}
--
Gitblit v1.9.3