diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java
index 2b2b01e9..b0d93a35 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java
@@ -1,6 +1,8 @@
 package com.nflg.product.bomnew.pojo.vo;
 
+import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.ImmutableMap;
+import com.nflg.product.bomnew.constant.BomConstant;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -33,12 +35,26 @@ public class BomNewPbomWorkExcelVO implements Serializable {
     @ExcelColumn(value = "物料编码")
     private String materialNo;
 
+    public String getMaterialNo() {
+        if (StrUtil.equals(projectType, BomConstant.PROJECT_TYPE_TEMPORARY)) {
+            return "";
+        }
+        return materialNo;
+    }
+
     @ExcelColumn("物料名称")
     private String materialName;
 
     @ExcelColumn(value = "图号")
     private String drawingNo;
 
+    public String getDrawingNo() {
+        if (StrUtil.equals(projectType, BomConstant.PROJECT_TYPE_TEMPORARY)) {
+            return "";
+        }
+        return drawingNo;
+    }
+
     @ExcelColumn(value = "版本号")
     private String currentVersion;
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index 8ad9c87a..fc0bf3cb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -304,7 +304,7 @@ public class DQBomService {
     public void deleteBom(Long rowId) {
         BomNewDQbomParentEntity root = dQBomParentService.getById(rowId);
         VUtils.isTure(Objects.isNull(root)).throwMessage("bom不存在");
-        VUtils.isTure(!SessionUtil.getUserCode().equals(root.getCreatedBy())).throwMessage("不能删除他人创建的bom");
+        //        VUtils.isTure(!SessionUtil.getUserCode().equals(root.getCreatedBy())).throwMessage("不能删除他人创建的bom");
         VUtils.isTure(root.getStatus().equals(DQBomStatusEnum.PUBLISHED.getValue())).throwMessage("不能删除已发布的bom");
 
         Set<Long> liChildren = new HashSet<>();
@@ -314,8 +314,12 @@ public class DQBomService {
         children.forEach(c -> {
             delete(liParents, liChildren, c);
         });
-        dQBomParentService.getBaseMapper().deleteBatchIds(liParents);
-        dQBomChildService.getBaseMapper().deleteBatchIds(liChildren);
+        if (CollUtil.isNotEmpty(liParents)) {
+            dQBomParentService.getBaseMapper().deleteBatchIds(liParents);
+        }
+        if (CollUtil.isNotEmpty(liChildren)) {
+            dQBomChildService.getBaseMapper().deleteBatchIds(liChildren);
+        }
     }
 
     private void delete(Set<Long> parents, Set<Long> children, BomNewDQbomVO bom) {