1

MrShi

2025-01-18 b417a422c08ceabd31fa7feaba42fd8a7b1e86d2

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

@@ -436,6 +436,7 @@
        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");
@@ -548,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);