diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index ae74b214..41d751f8 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -68,9 +68,11 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
             data1010.add(parent);
             for (BomNewEbomParentVO data : deliveryPackage1010) {
                 List<BomNewEbomParentVO> subVos = new ArrayList<>();
-                if (data.getMaterialName().contains("仙桃") && !VirtualPackageTypeEnum.PAINT_PACKAGE.equalsValue(data.getVirtualPartType())) { //只获取下降虚拟包(排除仙桃油漆包)
-                    subVos.add(data);
-                    subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
+                if (data.getMaterialName().contains("仙桃") ) { //只获取下降虚拟包(排除仙桃油漆包)
+                    if(!data.getMaterialName().contains(VirtualPackageTypeEnum.PAINT_PACKAGE.getDescription())) {
+                        subVos.add(data);
+                        subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
+                    }
                 } else {
 //                    subVos = result.stream().filter(u -> u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(), BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList());
                     subVos=getResultAllSubIncludeSelf(data);