|
@@ -84,7 +84,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
|
|
|
|
List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
|
|
|
wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())
|
|
|
- .or().like("li", LogisticsInfos::getBusinessCode, dto.getKeyword())
|
|
|
+ .or().like("IF( li.business_type IN ( 1, 5 ), p.contractCode, li.business_code ) ", dto.getKeyword())
|
|
|
.or().in("li", LogisticsInfos::getLogisticsCompanyCode, companyCodes)
|
|
|
.or(flag).like(flag,"pi.custom_code", dto.getKeyword())
|
|
|
.or(flag).like(flag,"pi.name", dto.getKeyword())
|