From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 2108dd2..573f959 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/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);
--
Gitblit v1.9.3