From edb3f88e7f46f632515641353446ad51e13e0d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 14 Aug 2024 11:00:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9B=BE=E5=8F=B7=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewEbomParentService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 990b492a..c3c9a425 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 @@ -2475,7 +2475,8 @@ public class BomNewEbomParentService extends ServiceImpl 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); //从子级开始查找 From 0a3aa2ba263e04bad02c6a38cd4db00b64ca23b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 14 Aug 2024 15:00:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(dqbom):=20=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E5=8F=96=E5=88=B0=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/service/DQBomImportService.java | 1 + 1 file changed, 1 insertion(+) 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 datas = excelContextTL.get(); + VUtils.isTure(datas.isEmpty()).throwMessage("未读取到数据，请检查表头是否正确"); List errorMsg = checkExcel(datas); if (!errorMsg.isEmpty()) {