diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index e0b2200c3..592883060 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -122,9 +122,9 @@
         plb.project_version versionNumber,
         pni.project_name car,
         pyni.year_name yearName from project_library_base plb
-        join project_name_info pni on pni.id = plb.project_name_id
-        join project_year_name_info pyni on pyni.project_name_id = pni.id
-        where plb.target_market LIKE CONCAT(CONCAT('%',#{market}),'%')
+        JOIN project_name_info pni ON pni.id = plb.project_name_id
+	    JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
+        where plb.target_market =#{market}
         and pni.project_name =#{car}
         GROUP BY plb.id
         ORDER BY project_version asc
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 ebf135cb0..4cc72cb04 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
@@ -1020,7 +1020,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
     @Override
     public List<VersionVO> getProjectVersionList(String carMarket, String cut) {
-
+        List<DictModel> dictModels = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
         List<VersionVO> result = new LinkedList<>();
         if (StringUtils.isNotBlank(carMarket)) {
             List<VersionVO> versionVOList = new LinkedList<>();
@@ -1031,6 +1031,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             if (conditionSplit.length > 1) {
                 market = conditionSplit[1];
             }
+
             if (StringUtils.isNotBlank(market)) {
                 if (market.equals("CN")) {
                     //项目库里市场存的是China  不是CN
@@ -1040,6 +1041,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     market = "UK";
                 }
             }
+            if("FORCE".equals(car)){
+                car = "Force";
+            }
+            String finalMarket = market;
+            List<DictModel> modelList = dictModels.stream().filter(e -> e.getTextEn().equals(finalMarket)).collect(Collectors.toList());
+            if(!modelList.isEmpty()){
+                market = modelList.get(0).getValue();
+            }
+
             versionVOList = this.getBaseMapper().getProjectVersion(car, market);
             List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
             List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());