From 9ddb32175b3624ba3a3cedbfc009d9d526391a20 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 11:54:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-after
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index eb7b820..744ad7e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -12,7 +12,6 @@
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -75,11 +74,18 @@
}
@Override
- public List<User> selectUser() {
+ public List<Map> selectUser() {
return userMapper.selectUser();
}
@Override
+ public List<Map<String, Object>> getUserNameAndId() {
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(User::getId, User::getName);
+ return userMapper.selectMaps(wrapper);
+ }
+
+ @Override
public Map<String, String> selectUserByUserId(int userId) {
return userMapper.selectUserByUserId(userId);
}
--
Gitblit v1.9.3