Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

@@ -253,11 +253,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "已超过预定还车时间，不能进行交车操作！");
             }
-            if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
+            if (null == userDTO.getCompanyIds() || !userDTO.getCompanyIds().contains(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }
         } else {
-            if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getEndCompanyId())) {
+            if (null == userDTO.getCompanyIds() || !userDTO.getCompanyIds().contains(orderRentVehicleDetail.getEndCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -386,7 +386,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo, Boolean flag) {
-        UserDTO userDTO = getAdminUserInfo();
+        UserDTO userDTO = getBusinessUserByAppUser();
         if(null == userDTO && null != getAppUser()) {
             userDTO = userFeign.businessUserinfoByMobilePhone(getAppUser().getUsername()).getData();
         }