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 getAllCarPage(OtaManageApplyEO otaManageApplyEO) { - List otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO); + List 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 getCarList(String cut, String plannedBpLaunchBatch) { Set set = new HashSet<>(); - if(isStudio()){ + if(!isOtaManager()){ List nameInfoEOList = projectNameInfoEOService.list(); List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); @@ -944,7 +946,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl