From c422139480d96f5511002e0668a7839a9d9858de Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 26 Sep 2024 15:37:47 +0800 Subject: [PATCH] =?UTF-8?q?BOM=E6=9F=A5=E7=9C=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/api/user/BomReportApi.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index 5db97165..b7685d68 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -35,6 +35,7 @@ import org.ttzero.excel.entity.ListSheet; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import javax.xml.transform.Result; import java.io.IOException; import java.util.List; import java.util.Map; @@ -133,7 +134,10 @@ public class BomReportApi extends BaseApi { } //物料描述从 物料主数据获取 by 10002327 240926 ReportBomVO r = forwardReportService.factoryBomType(query); - if(!r.getChildNodes().isEmpty()){ + if(r == null){ + return ResultVO.error("查无数据~"); + } + if(CollUtil.isNotEmpty(r.getChildNodes())){ Set materialNoSet = r.getChildNodes().stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toSet()); List materialMainList = materialMainService.list(Wrappers.lambdaQuery().in(MaterialMainEntity::getMaterialNo,materialNoSet)); Map materialMainMap = materialMainList.stream().collect(Collectors.toMap(MaterialMainEntity::getMaterialNo,MaterialMainEntity::getMaterialDesc,(k1, k2)->k1));