From b55474a9f81514912487de4c407b649b383705df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 25 Sep 2024 09:35:34 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/EBom/topbomnew/FormalEBomToPbomBase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
index 72804493..2a9437ad 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
@@ -321,7 +321,7 @@ public abstract class FormalEBomToPbomBase {
         pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
         pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
         //EBOM版本大于pbom版本则用EBOm版本
-        if(oldParent!=null && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
+        if( oldParent!=null &&  StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
             pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
             pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
         }