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 5024a92f..b102b086 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
@@ -2486,7 +2486,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         //根据编号或图号搜索
         //从顶级开始查找
         List<BomNewEbomParentVO> roots = result.getRecords().stream()
-                .filter(r -> StrUtil.equals(r.getMaterialNo(), query.getMaterialNo()) || StrUtil.equals(r.getDrawingNo(), query.getDrawingNo()))
+                .filter(r -> (StrUtil.isNotBlank(query.getMaterialNo()) && StrUtil.equals(r.getMaterialNo(), query.getMaterialNo()))
+                        || (StrUtil.isNotBlank(query.getDrawingNo()) && StrUtil.equals(r.getDrawingNo(), query.getDrawingNo())))
                 .collect(Collectors.toList());
         roots.forEach(this::buildChildren);
         //从子级开始查找
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
index aea6e2b9..0a262516 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
@@ -76,6 +76,7 @@ public class DQBomImportService {
             EecExcelUtil.handlerExcel(file.getInputStream(), DQbomExcelVO.class, this::handlerExcelRow);
 
             List<DQbomExcelVO> datas = excelContextTL.get();
+            VUtils.isTure(datas.isEmpty()).throwMessage("未读取到数据，请检查表头是否正确");
 
             List<OperationErrorMsgVO> errorMsg = checkExcel(datas);
             if (!errorMsg.isEmpty()) {