From 64d1db59b2869592977bc76b9e38255ef8582a23 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Thu, 31 Oct 2024 13:50:11 +0800
Subject: [PATCH] =?UTF-8?q?BOM=E5=AE=8C=E6=95=B4=E6=80=A7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 6edd7d1c..a3d63c00 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -176,8 +176,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
                     String queryFac= StrUtil.isBlank(query.getFacCode())? userRoleService.getUserFactory():query.getFacCode();
 
-                    List<BomNewPbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo,SessionUtil.getUserCode());
-                    List<BomNewPbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo,SessionUtil.getUserCode());
+                    List<BomNewPbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo,"20000041");//SessionUtil.getUserCode()
+                    List<BomNewPbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo,"20000041");
                     List<BomNewPbomParentVO> data = new ArrayList<>();
                     data.addAll(parents);
                     data.addAll(childs);
@@ -516,7 +516,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         } else {
                             child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
                         }
-                        if (type == 0 && child.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()) {
+                        if (type == 0 && child.getStatus() != null && child.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()) {
                             child.setStatus(PBomStatusEnum.BORROWED_PARTS.getValue());
                         }
                     }