From 0e1722e96e5483d560eda8f1cf96282955d4f224 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 27 七月 2023 15:04:40 +0800
Subject: [PATCH] 检验模块

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 fc5490c..2bbd242 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
@@ -3,7 +3,6 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.pojo.User;
 import com.yuanchu.limslaboratory.mapper.UserMapper;
@@ -13,13 +12,14 @@
 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;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -66,6 +66,20 @@
     }
 
     @Override
+    public String selectByUserId(Integer userId) {
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(User::getId, userId);
+        wrapper.select(User::getName);
+        User user = userMapper.selectOne(wrapper);
+        return user.getName();
+    }
+
+    @Override
+    public List<Map> selectUser() {
+        return userMapper.selectUser();
+    }
+
+    @Override
     public Map<String, String> selectUserByUserId(int userId) {
         return userMapper.selectUserByUserId(userId);
     }
@@ -74,12 +88,12 @@
     public User AccordingUsernameSelectAll(String account) {
         LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(User::getAccount, account);
-        wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount);
+        wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount, User::getEnterpriseId);
         return userMapper.selectOne(wrapper);
     }
 
     @Override
-    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo) {
+    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
         User user = new User()
                 .setName(newPersonnelVo.getName())
                 .setAccount(newPersonnelVo.getAccount())
@@ -87,7 +101,8 @@
                 .setPhone(newPersonnelVo.getPhone())
                 .setEmail(newPersonnelVo.getEmail())
                 .setRoleId(newPersonnelVo.getRole_id())
-                .setPassword(newPersonnelVo.getPassword());
+                .setPassword(newPersonnelVo.getPassword())
+                .setEnterpriseId(Integer.valueOf(enterpriseId));
         return userMapper.insert(user);
     }
 

--
Gitblit v1.9.3