From 1446f59688b8e65b784e0902d7267ac2aaedc905 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 23 Oct 2023 09:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E4=B8=8D=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaManageApplyEOServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index afe6e58ec..4abf2106b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -890,7 +890,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl collect = vprojectVersionList.stream().filter(e -> e.getProjectId().equals(manageApplyEO.getProjectVersion())).distinct().collect(Collectors.toList()); if (!collect.isEmpty()) { - manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket()); + if("NA".equals(collect.get(0).getProjectId())){ + if (CutEnum.CN.getValue().equals(cut)) { + manageApplyEO.setProjectVersionText("不涉及"); + } else { + manageApplyEO.setProjectVersionText("NA"); + } + }else{ + manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket()); + } } }else{ //没有设置项目版本的情况