Merge remote-tracking branch 'origin/main'

ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java

@@ -922,9 +922,10 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED)))
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH));
         List<EbikeBikeOrder> list = list(queryWrapper);
-        if (list == null) {
+        if (list.isEmpty()) {
             throw new EbikeException("列表中车辆工单均不存在或已作废");
         }
+        queryWrapper.clear();
         EbikeDispatchConfiguration dispatchConfiguration = ebikeDispatchConfigurationMapper.selectOneByQuery(queryWrapper);
         for (EbikeBikeOrder bikeOrder : list) {
             bikeOrder.setSiteId(dispatchVo.getSiteId());