From a762b57fe28c07ec7b62cc452fffb254a8352050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 17 Apr 2024 21:47:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java      |  2 +-
 .../domain/EBom/EBomCheckErrorDetailTask.java        | 12 +++++-------
 2 files changed, 6 insertions(+), 8 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 89cc6023..cd5e81ef 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,SessionUtil.getUserCode());
+        EBomCheckErrorDetailTask detailTask = new EBomCheckErrorDetailTask(bomDetail, SessionUtil.getUserCode(), SpringUtil.getBean(UserRoleService.class).getUserJob());
         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 cf0604af..4edf324b 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
@@ -3,11 +3,9 @@ package com.nflg.product.bomnew.service.domain.EBom;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
-import com.nflg.product.bomnew.service.UserRoleService;
 import com.nflg.product.bomnew.util.ListCommonUtil;
 import lombok.Getter;
 import lombok.Setter;
@@ -37,13 +35,13 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
 
     private String jobCode;
 
+    private Integer userJob;
 
 
-
-    public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail,String inJobCode) {
+    public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail, String inJobCode, Integer inUserJob) {
         bomDetail = inBomDetail;
         jobCode=inJobCode;
-
+        userJob = inUserJob;
     }
 
     /**
@@ -55,7 +53,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
         if (CollUtil.isNotEmpty(materialNos)) {
 
            // List<BomNewEbomParentEntity> childBomlist = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos).eq(BomNewEbomParentEntity::getLastVersionIs, 1).list();
-            Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob();
+            //Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob();
             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) {
@@ -98,7 +96,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
             if(CollUtil.isNotEmpty(childBowIds)) {
                 List<BomNewEbomParentVO> bom = SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getParentChildBatch(childBowIds);
 
-                EBomCheckErrorDetailTask task = new EBomCheckErrorDetailTask(bom);
+                EBomCheckErrorDetailTask task = new EBomCheckErrorDetailTask(bom, jobCode, userJob);
                 task.fork();
                 bomDetail.addAll(task.join());
                 return bomDetail;