diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index e7da154f5..2cc4fa25c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -2030,15 +2030,18 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImplquery().lambda(). + List processorEntityList = aftersalesProcessorService.list(Wrappers.query().lambda(). eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId()) .eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue()) ); List list1 = new ArrayList<>(); - if (ObjectUtils.isNotNull(one)) { + if (ObjectUtils.isNotNull(processorEntityList)) { AftersalesProcessorVO processorVO = new AftersalesProcessorVO(); - BeanUtil.copyProperties(one, processorVO); - list1.add(processorVO); + processorEntityList.forEach(f->{ + BeanUtil.copyProperties(f, processorVO); + list1.add(processorVO); + }); + } aftersalesWorkOrderVO.setProcessorVOList(list1); break; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index c8989c5b1..a4dd0aee2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -91,8 +91,7 @@ id ) AS productInformation FROM - logpm_distrilbution_bill_lading dbl - LEFT JOIN ( + ( SELECT CASE WHEN @@ -165,7 +164,8 @@ GROUP BY bbb.id ) AS m ON m.id = k.id - ) AS t ON t.id = dbl.id + ) AS t + LEFT JOIN logpm_distrilbution_bill_lading dbl ON t.id = dbl.id dbl.is_deleted=0 and dbl.pickup_batch like