From 4f03c6e3bea2ae7c1537fabe3e3bffc3f49b8e86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 13 十二月 2023 15:43:05 +0800
Subject: [PATCH] aa
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 484823e..68aca87 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -143,6 +144,7 @@
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(Company::getId, pageWrap.getModel().getId());
}
@@ -238,11 +240,12 @@
}
queryWrapper.orderByDesc(Company::getCreateDate);
queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
- .leftJoin(SystemUser.class,SystemUser::getId,Company::getCreator);
+ .leftJoin(Member.class, Member::getId,Company::getHeadId);
queryWrapper.selectAll(Company.class)
.selectAs(Category::getName,Company::getCategoryName)
- .select("count(t1.id) as countNum")
- .selectAs(SystemUser::getRealname,Company::getCreatorName);
+ .selectAs(Member::getName,Company::getHeadName)
+ .selectAs(Member::getPhone,Company::getHeadPhone)
+ .select("count(t1.id) as countNum");
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
--
Gitblit v1.9.3