From 776ba1d4941c31aab0d0fa41d0bf980cd7a4f38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 24 Jun 2024 17:53:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81existBom=E6=A0=87=E8=AE=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/OriginalBom/BaseConvert.java | 3 ++-
 .../service/domain/OriginalBom/OriginalBomToEBomV2Convert.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
index d2abb7e1..cf544447 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
@@ -1,6 +1,7 @@
 package com.nflg.product.bomnew.service.domain.OriginalBom;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
@@ -117,7 +118,7 @@ public abstract class BaseConvert {
         parentEntity.setMaterialDesc(material.getMaterialDesc());
         parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion));
         parentEntity.setNum(Convert.toBigDecimal(material.getQty()) );
-        parentEntity.setBomExist(childs.isEmpty()?0:1);
+        parentEntity.setBomExist(CollUtil.isEmpty(childs)?0:1);
         parentEntity.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(material)?1:0);
         parentEntity.setLastVersionIs(1);
         parentEntity.setMaterialTexture(material.getMaterial());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
index cf5645d0..ba90d467 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
@@ -373,7 +373,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
         eBomParent.setLastVersionIs(1);
         eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
         //eBomParent.setModifyTime(LocalDateTime.now());
-        eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0);
+//        eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0);
         eBomParent.setDeviseName(SessionUtil.getRealName());
         eBomParent.setDeptName(SessionUtil.getDepartName());
         eBomParent.setDeviseUserCode(SessionUtil.getUserCode());