自提列表搜索修复

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -2030,15 +2030,18 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 						//查询是否必须回复
-						AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda().
+						List<AftersalesProcessorEntity> processorEntityList = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda().
 							eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
 							.eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue())
 						);
 						List<AftersalesProcessorVO> list1 = new ArrayList<>();
-						if (ObjectUtils.isNotNull(one)) {
+						if (ObjectUtils.isNotNull(processorEntityList)) {
 							AftersalesProcessorVO processorVO = new AftersalesProcessorVO();
-							BeanUtil.copyProperties(one, processorVO);
+							processorEntityList.forEach(f->{
+								BeanUtil.copyProperties(f, processorVO);
 								list1.add(processorVO);
+							});
+
 						}
 						aftersalesWorkOrderVO.setProcessorVOList(list1);
 						break;

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
         <where>
              dbl.is_deleted=0
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like