Merge remote-tracking branch 'origin/master'

renkang

2025-01-03 ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -432,6 +432,18 @@
    }

    @Override
    public  List<Company>  listForConstract(Company company) {
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Company.class);
        queryWrapper.like(company.getName() != null,Company::getName, company.getName());
        queryWrapper.eq(Company::getStatus, Constants.ZERO);
        queryWrapper.eq(Company::getType, Constants.TWO);
        queryWrapper.eq(Company::getIsdeleted, Constants.ZERO);
        queryWrapper.exists("select b.id from yw_account b where b.isdeleted=0 and b.company_id=t.id and b.status=0");
        queryWrapper.orderByDesc(Company::getCreateDate);
        return companyMapper.selectList(queryWrapper);
    }
    @Override
    public List<Company> findList(Company company) {
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        if (company.getId() != null) {
@@ -537,7 +549,8 @@
        queryWrapper.select("t1.name",Company::getParentName);
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.apply(" t.isdeleted = 0 ") ;
        queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.apply(" t.status = 0 ") ;
//        queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
        queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"t1.name",company.getParentName());
        return companyMapper.selectList(queryWrapper);