From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

---
 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index c9f0694..d8cc65f 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -1,6 +1,7 @@
 package com.yuanchu.mom.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -21,6 +22,7 @@
 import org.springframework.util.DigestUtils;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,13 +79,13 @@
 
     @Override
     public int updateUser(User user) {
-        user.setDepartId("1,"+user.getDepartId());
+        user.setDepartId("1," + user.getDepartId());
         return userMapper.updateById(user);
     }
 
     @Override
     public int addUser(User user) {
-        user.setDepartId("1,"+user.getDepartId());
+        user.setDepartId("1");
         return userMapper.insert(user);
     }
 
@@ -126,44 +128,44 @@
     public int addPersonUser(PersonDto personDto) {
         AtomicReference<String> departId = new AtomicReference<>("");
         AtomicReference<String> companyName = new AtomicReference<>();
-        personDto.getCompany().forEach(company->{
+        personDto.getCompany().forEach(company -> {
             Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
-            if(BeanUtil.isEmpty(department)){
+            if (BeanUtil.isEmpty(department)) {
                 department = new Departments();
                 department.setName(company.getCompanyName());
                 department.setCompanyId(company.getCompanyId());
                 Departments department2 = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getParentCompanyId()));
-                if(BeanUtil.isEmpty(department2)){
+                if (BeanUtil.isEmpty(department2)) {
                     department.setFatherId(1);
-                }else{
+                } else {
                     department.setFatherId(department2.getId());
                 }
                 departmentsMapper.insert(department);
             }
-            departId.set(departId.get()+department.getId()+",");
+            departId.set(departId.get() + department.getId() + ",");
             companyName.set(department.getName());
         });
         personDto.getPerson().forEach(person -> {
             User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
-            if(BeanUtil.isEmpty(user)){
+            if (BeanUtil.isEmpty(user)) {
                 user = new User();
                 user.setName(person.getName());
                 user.setNameEn("not write");
                 user.setAccount(person.getEmployeeID());
                 user.setPhone(person.getPhoneNumber());
                 user.setEmail(person.getCompanyEmail());
-                user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+                user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
                 user.setDepartId(departId.get());
 //                user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
                 user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
                 user.setCompany(companyName.get());
                 user.setAddress("鏈～鍐�");
                 userMapper.insert(user);
-            }else{
+            } else {
                 user.setName(person.getName());
                 user.setPhone(person.getPhoneNumber());
                 user.setEmail(person.getCompanyEmail());
-                user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+                user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
                 user.setDepartId(departId.get());
                 user.setCompany(companyName.get());
                 user.setCreateUser(null);
@@ -175,4 +177,15 @@
         });
         return 1;
     }
+
+    @Override
+    public int upUserDepardLimsId(String ids, String id) {
+        List<Integer> userIds = JSON.parseArray(ids, Integer.class);
+        return userMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+    }
+
+    @Override
+    public int delUserDepardLimsId(Integer id) {
+        return userMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+    }
 }

--
Gitblit v1.9.3