diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
index ce88b79..1f47f95 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
@@ -65,13 +65,13 @@ public class EbikeBikeOrderController {
      * @return 分页对象
      */
     @GetMapping("pageByStaff")
-    public JsonResult<?> pageByStaff(PageParam page, Integer orderType, String bikeCode) {
+    public JsonResult<?> pageByStaff(PageParam page, Integer orderType, String bikeCode,Integer handelSate) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_ORDER.ALL_COLUMNS)
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType)))
                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode)))
                 .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()))
-                .and(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.VOIDED)))
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(handelSate,Objects.nonNull(handelSate)))
                 .leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE))
                 .orderBy(EBIKE_BIKE_ORDER.CREATED_AT.desc());
         Page<EbikeBikeOrderPageDto> orderPage = ebikeBikeOrderService.pageAs(page.getPage(), queryWrapper, EbikeBikeOrderPageDto.class);