WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230808_OTA'

Browse Source
This commit is contained in:
高嵩
2023-08-25 17:56:25 +08:00
parent 4878b91cdc 3cc9b3328d
commit c75fc7ba48
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+7 -5
View File
@@ -297,9 +297,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
*/ */
@Override @Override
public List<OtaManageApplyEO> getAllCarPage(OtaManageApplyEO otaManageApplyEO) { public List<OtaManageApplyEO> getAllCarPage(OtaManageApplyEO otaManageApplyEO) {
List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO); List<OtaManageApplyEO> otaManageApplyEOList = new ArrayList<>();
//studio数据权限 //studio数据权限
if(isStudio()) { if(isOtaManager()) {
otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
}else{
otaManageApplyEOList = getStudioData(otaManageApplyEO, otaManageApplyEOList); otaManageApplyEOList = getStudioData(otaManageApplyEO, otaManageApplyEOList);
} }
if (!otaManageApplyEOList.isEmpty()) { if (!otaManageApplyEOList.isEmpty()) {
@@ -881,7 +883,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
@Override @Override
public List<String> getCarList(String cut, String plannedBpLaunchBatch) { public List<String> getCarList(String cut, String plannedBpLaunchBatch) {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
if(isStudio()){ if(!isOtaManager()){
List<ProjectNameInfoEO> nameInfoEOList = projectNameInfoEOService.list(); List<ProjectNameInfoEO> nameInfoEOList = projectNameInfoEOService.list();
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); 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()); result = result.stream().distinct().collect(Collectors.toList());
if(isStudio()){ if(!isOtaManager()){
result.retainAll(set); result.retainAll(set);
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
result.add("全部"); result.add("全部");
@@ -1654,7 +1656,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
} }
if (StringUtils.isNotEmpty(plb.getTargetMarket())) { if (StringUtils.isNotEmpty(plb.getTargetMarket())) {
String[] marketStrs = plb.getTargetMarket().split(","); String[] marketStrs = plb.getTargetMarket().split(",");
if (marketStrs[0].equals("china")) { if (marketStrs[0].equals("China")) {
market = "CN"; market = "CN";
} else if (marketStrs[0].equals("UK")) { } else if (marketStrs[0].equals("UK")) {
market = "RHD"; market = "RHD";