From e143ad4f1f85fb4840681cc730bba75c09440837 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 23 Oct 2024 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E7=AB=AF=E9=85=8D=E9=80=81=E4=BD=9C=E4=B8=9A=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 处理商家端作业是仓库没有事业线报错问题
---
 .../com/logpm/basicdata/feign/BasicdataWarehouseClient.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
index 8fd6be6d4..c34d86f6c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
@@ -264,7 +264,9 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 							} else {
 								Long parentId = dept.getParentId();
 								Dept parentDept = deptClient.findEntityById(parentId);
-								warehouseEntity.setBusinessLine(parentDept.getDeptName());
+								if(ObjectUtil.isNotEmpty(parentDept)){
+									warehouseEntity.setBusinessLine(parentDept.getDeptName());
+								}
 							}
 						}
 					}