From e139c54a654e19cc4b62eafdb4cb40646d0b2ab7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Aug 2023 17:05:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/service/impl/OtaManageApplyEOServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c9c7f0af8..318a8850b 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
@@ -1654,7 +1654,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";

From 3cc9b3328d382936455f041c71a9188ce0d940c9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Aug 2023 17:17:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?studio=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 318a8850b..ebf135cb0 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
@@ -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("全部");