From 3d7dbe3b79bd1a3aa924e7c91c25f07fb4953e72 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 12 Nov 2024 12:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=88=97=E8=A1=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AftersalesWorkOrderServiceImpl.java  | 11 +++++++----
 .../mapper/DistrilbutionBillLadingMapper.xml          |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

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