123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1705,9 +1705,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                             vehicleTitle=branchCompany.getName()+"已取消经营";
                             statusText="待收车";
                             //经营 == 资产
-                        }else if (manageCompanyId.equals(subordinateBranc) ){
+                        }else if (manageCompanyId.equals(subordinateBranc) && manageCompanyId.equals(parkBranchCompanyId)){
                             handleOption.put("update", true);// 编辑操作
                         }else {
+                            if (!manageCompanyId.equals(subordinateBranc)){
+                                vehicleTitle=vehicleVO.getManageCompanyName()+"已经营";
+                            }else if (!manageCompanyId.equals(parkBranchCompanyId)){
+                                vehicleTitle=vehicleVO.getParkCompanyName()+"已停靠";
+                            }
                             statusText="已调出";
                         }
                     }else if (type == 2){