Merge branch 'master' into master-modify-background-bug-hf

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

@@ -108,17 +108,18 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @CrossOrigin
     public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(BaseOrderController.QueryOrderList dto) {
-        if (dto.getStartTime() != null) {
-            if (dto.getEndTime() == null) {
-                dto.setEndTime(new Date().getTime());
-            }
-        }
+		UserDTO userDTO = getAdminUserInfo();
+		if (userDTO == null) {
+			return ObjectRestResponse.succ(new PageDataVO<>());
+		}
+
         //车辆排班表查询订单详情
         if (dto.getOneNo()!=null) {
             dto.setPage(1);
             dto.setLimit(1);
             dto.setType(1);
         }
+
         if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
             List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
             if (CollectionUtil.isNotEmpty(appUserLoins)) {
@@ -128,19 +129,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
-
-
-        UserDTO userDTO = getAdminUserInfo();
-        if (userDTO == null) {
-            return ObjectRestResponse.succ(new PageDataVO<>());
-        }
-        //权限
-        if (userDTO.getDataAll()!=1&&dto.getType() != null && dto.getType() != 3) {
-            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-            List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-            dto.setCompanyIds(companyIds);
-        }
-        //大区查询
+        //获取权限公司列表
+        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        List<Integer> companyId = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+        dto.setCompanyIds(companyId);
+        //大区搜索
         if (dto.getZoneId() != null) {
             if (userDTO.getDataAll() != 1 && !dto.getZoneId().equals(userDTO.getZoneId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
@@ -451,6 +444,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return baseOrderBiz.save(orderRentVehicleDetail);
     }
 
+    @GetMapping(value = "/getAll")
+    @ResponseBody
+    public ObjectRestResponse getAllOrderList(BaseOrderController.QueryOrderList dto) {
+        return backgroundBaseOrderBiz.getAllOrderList(dto);
+    }
+
     @Data
     public static class ChangeVehicleDTO {
         String no;