|
|
@@ -119,17 +119,17 @@ public class CommonDataService {
|
|
|
.map(BusCustomerCompanyBusiness::getCustomerCompanyId)
|
|
|
.collect(Collectors.toSet());
|
|
|
|
|
|
- // 查询对应的客户公司信息(支持模糊搜索和分页)
|
|
|
- Page<BusCustomerCompany> companyPage;
|
|
|
+ // 查询对应的客户公司信息(支持模糊搜索)
|
|
|
+ List<BusCustomerCompany> allCompanies;
|
|
|
if (companyName != null && !companyName.isEmpty()) {
|
|
|
- companyPage = busCustomerCompanyRepository.findByNameContainingAndRecordStatus(
|
|
|
- companyName, 1, pageable);
|
|
|
+ allCompanies = busCustomerCompanyRepository.findByNameContainingAndRecordStatus(
|
|
|
+ companyName, 1);
|
|
|
} else {
|
|
|
- companyPage = busCustomerCompanyRepository.findAll(pageable);
|
|
|
+ allCompanies = busCustomerCompanyRepository.findAll();
|
|
|
}
|
|
|
|
|
|
// 过滤出船公司类型的数据并转换为DTO
|
|
|
- List<ShippingCompanyDTO> filteredCompanies = companyPage.getContent().stream()
|
|
|
+ List<ShippingCompanyDTO> filteredCompanies = allCompanies.stream()
|
|
|
.filter(company -> customerCompanyIds.contains(company.getCustomerCompanyId()))
|
|
|
.map(company -> new ShippingCompanyDTO(
|
|
|
company.getCustomerCompanyId(),
|
|
|
@@ -139,9 +139,17 @@ public class CommonDataService {
|
|
|
company.getMobile()))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- // 创建新的Page对象,只包含过滤后的数据
|
|
|
+ // 手动分页
|
|
|
+ int pageSize = pageable.getPageSize();
|
|
|
+ int currentPage = pageable.getPageNumber();
|
|
|
+ int start = currentPage * pageSize;
|
|
|
+ int end = Math.min(start + pageSize, filteredCompanies.size());
|
|
|
+
|
|
|
+ List<ShippingCompanyDTO> pageContent = filteredCompanies.subList(start, end);
|
|
|
+
|
|
|
+ // 创建新的Page对象
|
|
|
return new org.springframework.data.domain.PageImpl<>(
|
|
|
- filteredCompanies,
|
|
|
+ pageContent,
|
|
|
pageable,
|
|
|
filteredCompanies.size()
|
|
|
);
|