From 862fd4edc5359562b8ca18806a3b5a3d400fa655 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 23 Oct 2024 15:59:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseWaybillServiceImpl.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index e61579138..555f32502 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -907,11 +907,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			item.setDeliveryWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY, item.getDeliveryWay()));
 			item.setUrgency(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY, item.getUrgency()));
 			item.setTransportType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE, item.getTransportType()));
-			item.setPickupCompleteOrNotStr(item.getPickupCompleteOrNot() == 1 ? "是" : "否");
-			item.setTrunklineCompleteOrNotStr(item.getTrunklineCompleteOrNot() == 1 ? "是" : "否");
+			item.setPickupCompleteOrNotStr(Objects.isNull(item.getPickupCompleteOrNot())?"否":item.getPickupCompleteOrNot() == 1 ? "是" : "否");
+			item.setTrunklineCompleteOrNotStr(Objects.isNull(item.getTrunklineCompleteOrNot())?"否":item.getTrunklineCompleteOrNot() == 1 ? "是" : "否");
 			item.setWaybillStatus(WaybillStatusEnum.getValue(item.getWaybillStatus()));
-			item.setFreezeStatusStr(item.getFreezeStatus() == 1 ? "是" : "否");
-			item.setAbolishStatusStr(item.getAbolishStatus() == 1 ? "是" : "否");
+			item.setFreezeStatusStr(Objects.isNull(item.getFreezeStatus())?"否":item.getFreezeStatus() == 1 ? "是" : "否");
+			item.setAbolishStatusStr(Objects.isNull(item.getAbolishStatus())?"否":item.getAbolishStatus() == 1 ? "是" : "否");
 		});
 		return list;
 	}