From 016b1f8c15d2799f1f415bdcaf64fe53209a7319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 15 Apr 2024 12:25:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81ebom=20=E8=AE=BE=E8=AE=A1=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomNewEbomParentMapper.java      | 2 +-
 .../product/bomnew/service/BomNewEbomParentService.java   | 2 +-
 .../resources/mapper/master/BomNewEbomParentMapper.xml    | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
index 7042abf3..c2c67469 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
@@ -54,7 +54,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     Set<String> getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set<String> list);
 
-    List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList ,@Param("dataType") Integer dataType , @Param("createdBy") String createdBy);
+    List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList ,@Param("dataType") Integer dataType , @Param("technicianIs") Integer technicianIs,  @Param("createdBy") String createdBy);
 
     List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("bomRowIds") Collection<Long> bomRowIds , @Param("createdBy") String createdBy );
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 1260cb62..3dbc7a96 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -132,7 +132,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 materialNos.addAll(parentMaterialByMaterialNo);
                 if (CollUtil.isNotEmpty(materialNos)) {
                     List<BomNewEbomParentVO> childs=new ArrayList<>();
-                    List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(materialNos, query.getDataType() ,(getSelfIs && query.getDataType().equals(0) )?SessionUtil.getUserCode():null );
+                    List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(materialNos, query.getDataType() ,userRoleService.technician()?1:0,   SessionUtil.getUserCode() );
                     if(CollUtil.isNotEmpty(parents)) {
                          childs = this.getBaseMapper().getChildForMaterialNoSeach(materialNos, parents.stream().map(u -> u.getRowId()).collect(Collectors.toSet()), (getSelfIs && query.getDataType().equals(0)) ? SessionUtil.getUserCode() : null);
                     }
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 fd9aa2d6..6966829a 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
@@ -105,9 +105,11 @@
             status = 4
         </if>
         <if test="dataType==0" >
-               status   &lt; 4
-            <if test="createdBy!=null and createdBy!=''">
-                and created_by=#{createdBy}  and  status=1
+            <if  test="technicianIs==0 ">
+                and created_by=#{createdBy}  and  status in (1,3)
+            </if>
+            <if  test="technicianIs==1 ">
+                and (created_by=#{createdBy}  or   status=2 )
             </if>
 
         </if>