From c8b01767292b3acaae1cc93618265f8d0e0dbf71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:09:24 +0800
Subject: [PATCH] 开发8-26加班人员管理对接权限结束

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 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 72e2822..a95c292 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
@@ -126,23 +126,20 @@
 
     @Override
     public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
-        User user = new User()
-                .setName(updatePersonnelVo.getName())
-                .setAccount(updatePersonnelVo.getAccount())
-                .setAge(String.valueOf(updatePersonnelVo.getAge()))
-                .setPhone(updatePersonnelVo.getPhone())
-                .setEmail(updatePersonnelVo.getEmail())
-                .setRoleId(updatePersonnelVo.getRole_id())
-                .setPassword(updatePersonnelVo.getPassword())
-                .setJobState(updatePersonnelVo.getJobState());
-        LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(User::getId, updatePersonnelVo.getId());
-        return userMapper.update(user, updateWrapper);
+        try {
+            MyUtil.PrintLog(updatePersonnelVo.toString());
+            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
+
+            LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+            return userMapper.update(unmarshal, updateWrapper);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
     public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
-        MyUtil.PrintLog(name + status + "=============");
         return userMapper.getNewPersonnelPage(name, page, status);
     }
 

--
Gitblit v1.9.3