diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 73097be3..f92a15a4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -212,8 +212,8 @@ public class OrderController extends BaseController {
// 判断是否全部派完
if(request.getIsAll() == 1){
om.setOrderStatus(OrderStatus.GOING.code());
- orderMasterService.updateOrderMaster(om);
}
+ orderMasterService.updateOrderMaster(om);
// 创建子订单
OrderDetail od = new OrderDetail();
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 02fbf0c4..4b33bb8a 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -78,7 +78,7 @@
- AND all_self_assigned = 0 AND om.order_status in (2,3,4,5)
+ AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5)
AND om.dept_id = #{deptId}
@@ -152,7 +152,7 @@
SELECT COUNT(*) FROM order_master om
- AND all_self_assigned = 0 AND om.order_status in (2,3,4,5)
+ AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5)
AND om.dept_id = #{deptId}