Merge remote-tracking branch 'origin/dev_20230808_OTA'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -297,9 +297,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      */
     @Override
     public List<OtaManageApplyEO> getAllCarPage(OtaManageApplyEO otaManageApplyEO) {
-        List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
+        List<OtaManageApplyEO> otaManageApplyEOList = new ArrayList<>();
         //studio数据权限
-        if(isStudio()) {
+        if(isOtaManager()) {
+            otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
+        }else{
             otaManageApplyEOList = getStudioData(otaManageApplyEO, otaManageApplyEOList);
         }
         if (!otaManageApplyEOList.isEmpty()) {
@@ -881,7 +883,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Override
     public List<String> getCarList(String cut, String plannedBpLaunchBatch) {
         Set<String> set = new HashSet<>();
-        if(isStudio()){
+        if(!isOtaManager()){
             List<ProjectNameInfoEO> nameInfoEOList = projectNameInfoEOService.list();
             List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 
@@ -944,7 +946,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             }
         }
         result = result.stream().distinct().collect(Collectors.toList());
-        if(isStudio()){
+        if(!isOtaManager()){
             result.retainAll(set);
             if (CutEnum.CN.getValue().equals(cut)) {
                 result.add("全部");
@@ -1654,7 +1656,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 }
                 if (StringUtils.isNotEmpty(plb.getTargetMarket())) {
                     String[] marketStrs = plb.getTargetMarket().split(",");
-                    if (marketStrs[0].equals("china")) {
+                    if (marketStrs[0].equals("China")) {
                         market = "CN";
                     } else if (marketStrs[0].equals("UK")) {
                         market = "RHD";