From 6eee207e29f0a711478ecd37991b586d33a73b11 Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Sat, 29 Jun 2024 21:07:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomForwardReport.java | 5 +++-- .../bomnew/service/domain/PBom/PBomForwardReport.java | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index 7ec99775..7bdef0d9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -85,10 +85,11 @@ public class EBomForwardReport extends BaseForwardReport { if (CollUtil.isEmpty(reportBomVersionVO.getVList())) { return ""; } - if (reportBomVersionVO.getVList().size() == 1) { + //单条 + if (reportBomVersionVO.getVList().size() ==1) { return reportBomVersionVO.getVList().get(0).getVersion(); } - +//比较最大 String maxVersion = reportBomVersionVO.getVList().get(0).getVersion(); for (int index = 1; index < reportBomVersionVO.getVList().size(); index++) { String version = reportBomVersionVO.getVList().get(index).getVersion(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index 8191e1b7..acf54f4f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -86,10 +86,14 @@ public class PBomForwardReport extends BaseForwardReport { */ public String getMaxVersion() { ReportBomVersionVO reportBomVersionVO = bomVersion(); - if (reportBomVersionVO.getVList().size() == 1) { + if (CollUtil.isEmpty(reportBomVersionVO.getVList())) { + return ""; + } + //且为单条数据 + if (reportBomVersionVO.getVList().size() ==1) { return reportBomVersionVO.getVList().get(0).getVersion(); } - +//比较最大版本 String maxVersion = reportBomVersionVO.getVList().get(0).getVersion(); for (int index = 1; index < reportBomVersionVO.getVList().size(); index++) { String version = reportBomVersionVO.getVList().get(index).getVersion();