From a1817f303d21d56cba7c04951dd4cea9ede98bee Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 18 Jun 2024 01:00:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 0712ea5f2..8e944be45 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -7317,14 +7317,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return ;
 		}
 
+
+//		boolean isUpdate = false;
 		// 判断传入的2个对象中的deliveryStatus 是否相同
-		if (deliveryListEntity.getDeliveryStatus().equals(old.getDeliveryStatus())) {
-			return;
-		}
-		//判断传入2个对象中deliveryListLoadingStatus 是否相同
-		if (deliveryListEntity.getDeliveryListLoadingStatus().equals(old.getDeliveryListLoadingStatus())) {
-			return;
-		}
+//		if (deliveryListEntity.getDeliveryStatus().equals(old.getDeliveryStatus())) {
+//			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> deliveryStatus 相同，不更新");
+//			return;
+//		}
+//		//判断传入2个对象中deliveryListLoadingStatus 是否相同
+//		if (deliveryListEntity.getDeliveryListLoadingStatus().equals(old.getDeliveryListLoadingStatus())) {
+//			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> deliveryListLoadingStatus 相同，不更新");
+//
+//			return;
+//		}
 
 		updateById(deliveryListEntity);
 		log.info("配送信息状态已更新，deliveryId: {}", deliveryListEntity.getId());