From 7e60d7a6068577cbb63457f16a71b2df490ab775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 18 Mar 2024 08:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0null=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/OriginalBom/PlmBomToOriginalConvert.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
index e8e39cbc..1e641f15 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
@@ -126,12 +126,14 @@ public class PlmBomToOriginalConvert extends BaseConvert {
                 } else { //非草稿状态
                     //判断Ebom 的状态 eBom草稿：
                     BomNewEbomParentEntity ebom = getEbom(parent.getChartNo());
-                    if (ebom.getStatus()<EBomStatusEnum.PUBLISHED.getValue()) {
+                    if(ebom==null){
+                        importErrorResult.add(new ImportOriginalBomVO(parent.getChartNo(),"未找到ebom数据") );
+                    }
+                    else if (ebom.getStatus()<EBomStatusEnum.PUBLISHED.getValue()) {
                         //相同用户
-                        if (ebom.getCreatedBy() == parent.getCreatedBy()) {
+                        if (Objects.equals(ebom.getCreatedBy(), parent.getCreatedBy())) {
                             importErrorResult.add(new ImportOriginalBomVO(parent.getChartNo(),"此数据已创建BOM，请删除BOM重新导入") );
                              // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"此数据已创建BOM，请删除BOM重新导入");
-
                         } else {
                             UserInfoVO userInfo =SpringUtil.getBean(UserInfoService.class).getUserInfoByUserCode(ebom.getCreatedBy());
                             importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),"此数据已被"+userInfo.getRealName()+"("+userInfo.getUserCode()+")创建，请联系TA处理"));
@@ -147,7 +149,6 @@ public class PlmBomToOriginalConvert extends BaseConvert {
                         }
                     }
                 }
-
             }
         }
         else //无子级