|
|
@@ -5098,7 +5098,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
log.debug("获取企业ID集合: {}", entIds);
|
|
|
Set<Long> logOrderIds = getLogOrderIds(req, entIds,entId);
|
|
|
boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
|
|
|
- req.getCarrierId(), req.getConsignorId());
|
|
|
+ req.getCarrierId(), req.getConsignorId()) || Objects.nonNull(entId);
|
|
|
if(org.apache.commons.collections4.CollectionUtils.isEmpty(logOrderIds) && b1){
|
|
|
Map<Integer, List<KwtWaybillOrderSubtask>> stausAndBillOrdersMap = Maps.newHashMap();
|
|
|
List<StatisticsWaybillResp.OrderBillStatusStatistics> statusStatistics = carWaybillV1Enums.stream()
|