全部车型(权限)
This commit is contained in:
+5
-5
@@ -313,7 +313,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<OtaManageApplyEO> getStudioData(OtaManageApplyEO otaManageApplyEO, List<OtaManageApplyEO> otaManageApplyEOList) {
|
private List<OtaManageApplyEO> getStudioData(OtaManageApplyEO otaManageApplyEO, List<OtaManageApplyEO> otaManageApplyEOList) {
|
||||||
List<OtaManageApplyEO> list = new ArrayList<>();
|
Set<OtaManageApplyEO> set = new HashSet<>();
|
||||||
List<String> studioCarList = getStudioCarList(otaManageApplyEO.getPlannedBpLaunchBatch());
|
List<String> studioCarList = getStudioCarList(otaManageApplyEO.getPlannedBpLaunchBatch());
|
||||||
for (String carMarket : studioCarList) {
|
for (String carMarket : studioCarList) {
|
||||||
String[] conditionSplit = carMarket.split(" ");
|
String[] conditionSplit = carMarket.split(" ");
|
||||||
@@ -325,18 +325,18 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
for (String appliedVehicleProjectTemp : appliedVehicleProjectArr) {
|
for (String appliedVehicleProjectTemp : appliedVehicleProjectArr) {
|
||||||
String[] split = appliedVehicleProjectTemp.split(" ");
|
String[] split = appliedVehicleProjectTemp.split(" ");
|
||||||
if (split.length == 1) {
|
if (split.length == 1) {
|
||||||
list.add(manageApplyEO);
|
set.add(manageApplyEO);
|
||||||
break;
|
break;
|
||||||
} else if (split.length == 2) {
|
} else if (split.length == 2) {
|
||||||
if (Arrays.equals(conditionSplit, split)) {
|
if (Arrays.equals(conditionSplit, split)) {
|
||||||
list.add(manageApplyEO);
|
set.add(manageApplyEO);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (split.length == 3) {
|
} else if (split.length == 3) {
|
||||||
List<String> listTemp = Arrays.asList(split);
|
List<String> listTemp = Arrays.asList(split);
|
||||||
List<String> conditionList = Arrays.asList(conditionSplit);
|
List<String> conditionList = Arrays.asList(conditionSplit);
|
||||||
if (listTemp.containsAll(conditionList)) {
|
if (listTemp.containsAll(conditionList)) {
|
||||||
list.add(manageApplyEO);
|
set.add(manageApplyEO);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -344,7 +344,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
otaManageApplyEOList= list;
|
otaManageApplyEOList= new ArrayList<>(set);
|
||||||
return otaManageApplyEOList;
|
return otaManageApplyEOList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user