diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java
index 2aa7bed..de88644 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java
@@ -39,7 +39,7 @@ public class PlayOrderInfoQueryVo extends BasePageEntity {
     /**
      * 订单类型【-1:退款订单;0:充值订单；1:提现订单；2:普通订单】
      */
-    private String orderType = "2";
+    private String orderType;
 
     /**
      * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单）
diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
index a5a327b..a08347b 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
@@ -496,9 +496,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
         if (StringUtils.isNotBlank(vo.getOrderType())) {
             lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, vo.getOrderType());
         }
-        // 加入组员的筛选
+        // 加入组员的筛选，要么acceptBy为空，要么就在in里面
         List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), vo.getClerkNickName());
-        lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList);
+        lambdaQueryWrapper.and(i -> i.isNull(PlayOrderInfoEntity::getAcceptBy).or().in(PlayOrderInfoEntity::getAcceptBy, clerkIdList));
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper);
     }
 
@@ -631,7 +631,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
         if (StringUtils.isNotBlank(entity.getOrderType())) {
             lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, entity.getOrderType());
         }
-        lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getPurchaserTime);
+        lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getCreatedTime);
         return lambdaQueryWrapper;
 
     }
@@ -773,7 +773,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
         customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().add(orderInfo.getOrderMoney()), "3", "订单退款", orderInfo.getOrderMoney(), BigDecimal.ZERO, orderId);
         // 取消订单后，记录退款信息
         playOrderRefundInfoService.add(orderId, orderInfo.getPurchaserBy(), orderInfo.getAcceptBy(), orderInfo.getPayMethod(), "0", orderInfo.getFinalAmount(), refundReason, operatorByType, operatorBy, "0", "0");
-        wxCustomMpService.sendOrderCancelMessage(orderInfo,refundReason);
+        wxCustomMpService.sendOrderCancelMessage(orderInfo, refundReason);
     }
 
     @Override