diff --git a/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java b/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java
index 3262100..b1af954 100644
--- a/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java
+++ b/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java
@@ -35,14 +35,6 @@ public class SaTokenConfigure {
                         // 登录校验 -- 拦截所有路由，并排除/user/doLogin 用于开放登录
                         SaRouter.match("/**", "/staff/ebikeOperatorStaff/login", r -> StpUtil.checkLogin());
                     }
-
-                    // 权限认证 -- 不同模块, 校验不同权限
-//                    SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
-//                    SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
-//                    SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
-//                    SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
-
-                    // 更多匹配 ...  */
                 });
     }
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index b117ded..cae2286 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -546,18 +546,24 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
                                                 .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
                                 ))
-                                .then(
-                                        QueryWrapper.create()
-                                                .select(EBIKE_BIKE_ORDER.IS_USER_REPORTING)
-                                                .from(EBIKE_BIKE_ORDER)
-                                                .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
-                                                .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
-                                                // 如果有多个巡检工单，可以添加排序和 limit 1
-                                                .orderBy(EBIKE_BIKE_ORDER.CREATED_AT.desc())
-                                                .limit(1)
-                                )
+                                .then(true)
                                 .else_(false)
                                 .end().as(EbikeOrderBikeListDto::getHasInspectionOrder),
+                        QueryMethods.case_()
+                                .when(
+                                        QueryMethods.exists(
+                                                QueryWrapper.create()
+                                                        .select("1")
+                                                        .from(EBIKE_BIKE_ORDER)
+                                                        .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                                                        .and(EBIKE_BIKE_ORDER.HANDLE_STATE.in(OrderHandleState.UNPROCESSED, OrderHandleState.ACCEPTED))
+                                                        .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
+                                                        .and(EBIKE_BIKE_ORDER.IS_USER_REPORTING.eq(true))  // 直接在这里判断
+                                        )
+                                )
+                                .then(true)
+                                .else_(false)
+                                .end().as("isUserReporting"),
                         // 判断是否有换电工单
                         QueryMethods.case_()
                                 .when(QueryMethods.exists(
@@ -623,9 +629,13 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus)))
                 .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
         if (acceptOrder != null && acceptOrder) {
-            queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
+            queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
+                    .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
         } else if (orderType != null) {
-            queryWrapper.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
+            queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
+                    .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
         }
         List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class);
         List<String> snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList();