From c9da1b0da1178911e383ddcaebecd1e088fa6004 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:37:07 +0800
Subject: [PATCH] 修改bug

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 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 a30ccda..47b0741 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,6 +12,7 @@
 import com.yuanchu.limslaboratory.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.JsonUtil;
 import com.yuanchu.limslaboratory.utils.MyUtil;
 import com.yuanchu.limslaboratory.utils.RedisUtil;
 import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
@@ -94,9 +95,10 @@
     }
 
     @Override
-    public List<Map<String, Object>> getUserNameAndId() {
+    public List<Map<String, Object>>
+    getUserNameAndId() {
         LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(User::getId, User::getName);
+        wrapper.select(User::getId, User::getName).eq(User::getType,1);
         return userMapper.selectMaps(wrapper);
     }
 
@@ -120,13 +122,9 @@
 
     @Override
     public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
-        try {
-            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);
-            unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
-            return userMapper.insert(unmarshal);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        User unmarshal = JsonUtil.jsonToPojo(JsonUtil.jsonToString(newPersonnelVo), User.class);
+        unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
+        return userMapper.insert(unmarshal);
     }
 
     @Override

--
Gitblit v1.9.3