From f796e098e5d45d2976fc925543a449606f982694 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Wed, 17 Apr 2024 20:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java   | 2 +-
 .../service/domain/EBom/EBomCheckErrorDetailTask.java     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

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 e1a6cf58..066a0fdf 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
@@ -535,7 +535,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         List<BomNewEbomParentVO> bomDetail = this.getBaseMapper().getParentChild(rowId);
 //        EBomDetailTask detailTask = new EBomDetailTask(bomDetail);
 
-        EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail);
+        EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail,SessionUtil.getUserCode());
         ForkJoinTask<List<BomNewEbomParentVO>> submit = bomDetailPool.submit(detailTask);
 
         List<BomNewEbomParentVO> result = submit.join();
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 4614f40a..cf0604af 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
@@ -35,12 +35,14 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
 
     List<BomNewEbomParentVO> result = new ArrayList<>();
 
+    private String jobCode;
 
 
 
-    public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail) {
+
+    public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail,String inJobCode) {
         bomDetail = inBomDetail;
-
+        jobCode=inJobCode;
 
     }
 
@@ -54,7 +56,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
 
            // List<BomNewEbomParentEntity> childBomlist = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos).eq(BomNewEbomParentEntity::getLastVersionIs, 1).list();
             Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob();
-            List<BomNewEbomParentEntity> childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, SessionUtil.getUserCode(),materialNos);
+            List<BomNewEbomParentEntity> childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, jobCode,materialNos);
             Map<String, BomNewEbomParentEntity> stringBomNewOriginalParentEntityMap = ListCommonUtil.listToMap(childBomlist, BomNewEbomParentEntity::getMaterialNo);
             for (BomNewEbomParentVO detailVO : bomDetail) {
                 if (stringBomNewOriginalParentEntityMap.containsKey(detailVO.getMaterialNo())) {