From ced35443353a013091a70a240c846e4344fec19d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 03 六月 2025 15:22:04 +0800
Subject: [PATCH] 小程序接口 发布
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java
index 6766ef7..6db2e48 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.system.dto.EditCompanyDto;
import com.ruoyi.system.dto.PushCompanyDto;
import com.ruoyi.system.mapper.TbCompanyMapper;
-import com.ruoyi.system.mapper.TbOpeningBankMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.CompanyListQuery;
import com.ruoyi.system.query.MyPushCompanyListQuery;
@@ -17,8 +16,6 @@
import com.ruoyi.system.vo.CustomerInfoVo;
import com.ruoyi.system.vo.IndexCompanyListVo;
import com.ruoyi.system.vo.MyPushCompanyListVo;
-import org.apache.poi.ss.formula.functions.T;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,6 +57,9 @@
@Autowired
private TbUserService userService;
+
+ @Autowired
+ private TbCompanyTypeService companyTypeService;
@Override
public Page<IndexCompanyListVo> getCompanyList(CompanyListQuery query, Long userId) {
@@ -123,6 +123,9 @@
queryWrapper.orderByDesc(TbCompany::getCreateTime);
}
Page<TbCompany> companyPage = this.baseMapper.selectPage(page, queryWrapper);
+ if (companyPage.getRecords().isEmpty()) {
+ return page1;
+ }
List<Integer> ids = companyPage.getRecords().stream().map(TbCompany::getCompanyIndustryId).collect(Collectors.toList());
List<TbIndustry> tbIndustries = industryService.list(new LambdaQueryWrapper<TbIndustry>().in(TbIndustry::getId, ids));
ArrayList<IndexCompanyListVo> list = new ArrayList<>();
@@ -214,8 +217,13 @@
List<TbOpeningBank> list1 = openingBankService.list(new LambdaQueryWrapper<TbOpeningBank>().eq(TbOpeningBank::getCompanyId, companyId));
companyDetailVo.setOpeningBanks(list1);
+ Integer companyCategory = tbCompany.getCompanyCategory();
+ TbCompanyType byId = companyTypeService.getById(companyCategory);
+ companyDetailVo.setCompanyCategoryName(byId.getName());
+
// 当前未产生订单
if (tbCompany.getStatus() == 1) {
+ companyDetailVo.setStatus(1);
return companyDetailVo;
}
--
Gitblit v1.7.1