Merge branch 'dev-chw-vehicle' into dev-chw

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -276,18 +276,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			orderPageVo.setUsername(appUserVo.getRealname());
 			orderPageVo.setPositionName(appUserVo.getPositionName());
 		}
-		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+		List<Integer> companyIds = userDTO.getCompanyIds();
 
 		if (orderPageVo.getOrderRentVehicleDetail() != null) {
 
 			if (orderPageVo.getStatus() == 4) { //未交车
-				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
+				if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
 					orderPageVo.setUserCompanyStatus(true);
 				}
 				getDriverInfo(orderPageVo);
 			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
-				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+				if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 					orderPageVo.setUserCompanyStatus(true);
 				}
 				//设置违约金金额