From e3632534b588de388ac1b2c62d38fc0001f33cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 18 Feb 2024 15:24:37 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/domain/EBom/EBomToPBom.java | 6 ++++++
 .../com/nflg/product/base/core/conmon/util/SessionUtil.java | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index feee550f..809485de 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -84,10 +84,16 @@ public class EBomToPBom {
         //bom 提层
         liftingLayer();
         List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
+        List<String> hasConvert=new ArrayList<>();
 
         for (String facCode : facCodes) {
             //buildPBomParent(parent, facCode);
             for (BomNewEbomParentVO vo : parentList) {
+                String hasConvertKey=StrUtil.join(facCode,vo.getBomRowId());
+                if(hasConvert.contains(hasConvertKey)){
+                    continue;
+                }
+                hasConvert.add(hasConvertKey);
                 //构建变更明细
                 buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
                 buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
index 8dd3caff..23439237 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
@@ -29,7 +29,7 @@ public class SessionUtil {
      * @return
      */
     public static String getUserCode() {
-        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QMB07072700");
+        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100");
     }
 
     /**
@@ -38,7 +38,7 @@ public class SessionUtil {
      * @return
      */
     public static String getUserName() {
-        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserName).orElse(null);
+        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserName).orElse("郑军榕");
     }
 
     /**
@@ -51,7 +51,7 @@ public class SessionUtil {
     }
 
     public static String getRealName() {
-        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRealName).orElse(null);
+        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRealName).orElse("郑军榕");
     }
 
     public static String getDepartName() {