From f12a19cba4625223b13148348ec28faa8ef43bb5 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, 22 Apr 2024 15:07:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=E7=9A=84=E6=A0=B9=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/EBom/CheckEBomException.java       |  4 ++--
 .../service/domain/EBom/EBomCheckErrorDetailTask.java | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index 6cd4954d..68deccdf 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -129,8 +129,8 @@ public class CheckEBomException {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
             } else if (StrUtil.isNotBlank(vo.getMaterialNo()) && Objects.isNull(vo.getMaterialState())) {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
-            } else if (StrUtil.isBlank(vo.getProjectType())
-                    && (Objects.equals(vo.getRootIs(), 0) && Objects.equals(vo.getUserRootIs(), 0) && Objects.equals(vo.getRootIsForWaitReview(), 0))) {
+            } else if (StrUtil.isBlank(vo.getProjectType()) && !Objects.equals(vo.getRootIs(), 1)
+                    && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue());
             } else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java
index 4edf324b..57afe811 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java
@@ -68,13 +68,16 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
                     detailVO.setDeviseName(ebomParentEntity.getDeviseName());
                     detailVO.setBomExist(ebomParentEntity.getBomExist());
                     detailVO.setStatus(ebomParentEntity.getStatus());
+                    detailVO.setRootIs(ebomParentEntity.getRootIs());
+                    detailVO.setUserRootIs(ebomParentEntity.getUserRootIs());
+                    detailVO.setRootIsForWaitReview(ebomParentEntity.getRootIsForWaitReview());
+                } else {
+                    detailVO.setRootIs(0);
+                    detailVO.setUserRootIs(0);
+                    detailVO.setRootIsForWaitReview(0);
                 }
             }
-
-
         }
-
-
     }
 
     /**