diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java index 58c3cb394..7ca0985c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java @@ -7,7 +7,7 @@ public enum OtaCarEnum { ALL("All", "All"), - CN_ALL("CN All", "EU All"), + CN_ALL("CN All", "CN All"), EU_ALL("EU All", "EU All"); String name; 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 aba432656..897dd60c0 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 @@ -245,23 +245,27 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl marketSet = new HashSet<>(); for (String appliedVehicleProject : carList) { - Set marketSet = new HashSet<>(); - for (String s : appliedVehicleProject.split(",")) { - String[] split = s.split(" "); - if (split.length == 2) { - if (!otaNameList.contains(s)) { - marketSet.add(split[1]); - } - } else if (split.length == 3) { - if (!otaNameList.contains(s)) { - marketSet.add(split[2]); + if(otaNameList.contains(appliedVehicleProject)){ + marketSet.add(appliedVehicleProject); + }else{ + for (String s : appliedVehicleProject.split(",")) { + String[] split = s.split(" "); + if (split.length == 2) { + if (!otaNameList.contains(s)) { + marketSet.add(split[1]); + } + } else if (split.length == 3) { + if (!otaNameList.contains(s)) { + marketSet.add(split[2]); + } } } } - if (!marketSet.isEmpty()) { - manageApplyEO.setMarket(StringUtils.join(marketSet, ",")); - } + } + if (!marketSet.isEmpty()) { + manageApplyEO.setMarket(StringUtils.join(marketSet, ",")); } } }