Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

2023-10-23 09:26:02 +08:00
parent 1f260e62c2 1446f59688
commit 161d70ae20
1 changed files with 9 additions and 1 deletions
@@ -890,7 +890,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                    //项目版本
                    List<VersionVO> 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{
                    //没有设置项目版本的情况