From 870d61215454edc7a08908b451a5291ef30f749c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 17 May 2024 16:14:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=B8=80=E4=BA=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/CheckEBomException.java     | 2 --
 .../resources/mapper/master/BomNewEbomParentMapper.xml     | 7 ++++---
 2 files changed, 4 insertions(+), 5 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 8d49a822..49c88ad8 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
@@ -143,8 +143,6 @@ public class CheckEBomException {
                     vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
                 } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) && StrUtil.isBlank(vo.getExceptionTag())) {
                     vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
-                } else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())) {
-                    vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
                 }
             }
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 0f37ca5c..233bedd5 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -399,13 +399,14 @@
                 AND created_by = #{userCode}
             </if>
             <if test="userJob==0">
-                AND status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}
+                AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND
+                created_by=#{userCode}
             </if>
             <if test="userJob==1 and query.dataType==0">
-                AND root_is=1 AND status=2
+                AND (root_is=1 OR user_root_is=1) AND status=2
             </if>
             <if test="userJob==1 and query.dataType==1">
-                AND root_is=1 AND status=4
+                AND (root_is=1 OR user_root_is=1) AND status=4
             </if>
             <if test="query.deviseName!=null and query.deviseName!=''">
                 AND devise_name=#{query.deviseName}