From 2ce1562c33dab74dc8a161edbe698b4942624c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 25 Dec 2023 11:12:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/EbomInitProjectType.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EbomInitProjectType.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EbomInitProjectType.java
index 580efded..37251ffb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EbomInitProjectType.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EbomInitProjectType.java
@@ -107,12 +107,12 @@ public class EbomInitProjectType {
                 BomNewEbomParentVO parent = getParent(child.getParentRowId());
                 if (Objects.nonNull(parent) &&  Objects.nonNull(parent.getProjectType()) && parent.getProjectType().equals("Q")) {
                     List<BomNewEbomParentVO> subChild = getChilds(child.getBomRowId());
-                    List<BomNewEbomParentVO> collect = subChild.stream().filter(u -> u.getMaterialCategoryCode().startsWith("1004")).collect(Collectors.toList());
+                    List<BomNewEbomParentVO> collect = subChild.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialCategoryCode()) &&  u.getMaterialCategoryCode().startsWith("1004")).collect(Collectors.toList());
                     collect.forEach(u -> u.setProjectType("L"));
                 }
 
                 //11
-                if ((child.getMaterialCategoryCode().startsWith("10") || child.getMaterialCategoryCode().startsWith("40")) && !child.getMaterialCategoryCode().startsWith("1013") && !child.getMaterialCategoryCode().startsWith("100601"));
+                if (StrUtil.isNotBlank(child.getMaterialCategoryCode()) &&  (child.getMaterialCategoryCode().startsWith("10") || child.getMaterialCategoryCode().startsWith("40")) && !child.getMaterialCategoryCode().startsWith("1013") && !child.getMaterialCategoryCode().startsWith("100601"));
                 {
                     MaterialHistoryProjectTypeVO materialHistoryProjectType = SpringUtil.getBean(BomNewEbomParentMapper.class).getMaterialHistoryProjectType(child.getMaterialNo());
                     if (Objects.nonNull(materialHistoryProjectType)) {