diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index 186b638e..03aa6c03 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -169,7 +169,7 @@ public class WorkerController extends BaseController {
             }
             // 如果选择了上级类目但未选择最终类目,则查询该类目下所有子类目
             if(StringUtils.isNotEmpty(workerListRequest.getCategoryLevel1())
-                    && workerListRequest.getGoodsCategoryId() == null) {
+                    && StringUtils.isEmpty(workerListRequest.getCategoryLevel2()) && workerListRequest.getGoodsCategoryId() == null) {
                 // 1. 先查找二级类目
                 GoodsCategory param = new GoodsCategory();
                 param.setParentCategoryId(Long.valueOf(workerListRequest.getCategoryLevel1()));
diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 92afb834..052ee9d9 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -203,7 +203,7 @@ public class OrderServiceImpl implements OrderService {
                 }
             }
             // 未超时的单
-            if (order.getOrderStatus().equals(OrderStatus.SERVER.code())) {
+            else if (order.getOrderStatus().equals(OrderStatus.SERVER.code())) {
                 // 服务中状态要按预计上门时间计算4h超时
                 Date overTime = DateUtils.addMilliseconds(order.getExpectTimeStart(), 4 * 60 * 60 * 1000);
                 if (overTime.before(now)) {