From 9328e1b87ef53c7210a7d8342d8af8800c91809e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 10:52:00 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 ca0ccf9..de5754d 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
@@ -492,7 +492,7 @@
queryWrapper.apply(" t.id in ( select hdp.COMPANY_ID from hidden_danger_param hdp where hdp.ISDELETED = 0 and hdp.STATUS = 0 and hdp.TYPE = 0 ) ");
}
queryWrapper.orderByDesc(Company::getCreateDate);
- queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
+ queryWrapper.leftJoin("company t1 on t1.id=t.parent_id");
queryWrapper.select(" t.* ")
.select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
queryWrapper.select("t1.name",Company::getParentName);
@@ -500,7 +500,7 @@
queryWrapper.apply(" t.isdeleted = 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()),"c.name",company.getParentName());
+ queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"t1.name",company.getParentName());
return companyMapper.selectList(queryWrapper);
}
@@ -604,9 +604,7 @@
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
queryWrapper.orderByDesc(Company::getCreateDate);
- queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
- /* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
- /* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
+ queryWrapper.leftJoin("company t1 on t1.id=t.parant_id");
queryWrapper.selectAll(Company.class)
.select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) ",Company::getCountNum)
.select("(select count(m.id) from yw_account m where m.COMPANY_ID=t.id and m.ISDELETED=0)",Company::getAccountNum) ;
@@ -614,7 +612,7 @@
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"t1.name",pageWrap.getModel().getParentName());
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
--
Gitblit v1.9.3