From 7c28a6f5c80643240fbafb1b6f977a204dc526cf Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 28 Aug 2023 10:15:50 +0800
Subject: [PATCH] =?UTF-8?q?OTA=E5=88=97=E8=A1=A8-=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/ota/enums/OtaCarEnum.java    |  2 +-
 .../impl/OtaManageApplyEOServiceImpl.java     | 30 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

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 4cc72cb04..4cd84a760 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
@@ -247,23 +247,27 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                             carList = carList.stream().distinct().collect(Collectors.toList());
                             manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ","));
                             //市场
+                            Set<String> marketSet = new HashSet<>();
                             for (String appliedVehicleProject : carList) {
-                                Set<String> 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, ","));
                             }
                         }
                     }