|
|
@@ -2322,7 +2322,8 @@ public class KwtLogisticsConsignmentService {
|
|
|
*/
|
|
|
private boolean shouldReturnEmptyResult(Set<Long> logOrderIds, Set<Long> entList, QueryLogisticsOrderReq req) {
|
|
|
return CollectionUtils.isEmpty(logOrderIds) &&
|
|
|
- (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getContractId(), req.getGoodsName(), req.getConsignCompanyId(), req.getCarriageCompanyId()));
|
|
|
+ (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getContractId(), req.getGoodsName(), req.getConsignCompanyId(), req.getCarriageCompanyId())
|
|
|
+ || org.apache.commons.collections4.CollectionUtils.isNotEmpty(entList));
|
|
|
}
|
|
|
|
|
|
/**
|