功能调整

value

2024-05-27 d9958d7a0acbeba3235a9b6c57ee55f45d9c6568

功能调整

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -126,7 +126,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addPersonUser(PersonDto personDto) {
        AtomicReference<String> departId = new AtomicReference<>("");
        AtomicReference<String> departId = new AtomicReference<>("1,");
        AtomicReference<String> companyName = new AtomicReference<>();
        personDto.getCompany().forEach(company -> {
            Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));

 user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java

@@ -18,7 +18,6 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@@ -73,10 +72,11 @@
        }catch (Exception e){
            throw new ErrorException(e.getMessage());
        }
        return companies.stream().filter(ob->{
        /*return companies.stream().filter(ob->{
            if(ob.getStatus().equals("enabled")) return true;
            return false;
        }).collect(Collectors.toList());
        }).collect(Collectors.toList());*/
        return companies;
    }

    public List<Person> userUrl(String companyId) {
@@ -91,11 +91,8 @@
            throw new ErrorException(e.getMessage());
        }
        return person.stream().filter(ob->{
            if(Objects.equals(ob.getStatus(), "enabled")) {
                ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
                return true;
            }
            return false;
            ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
            return true;
        }).collect(Collectors.toList());
    }