diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 1fac33e2..36dce88e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -232,6 +232,8 @@ public class OrderMasterController extends BaseController { List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); StringBuilder orderDetailIds = new StringBuilder(); OrderDetail orderDetail = new OrderDetail(); + orderDetail.setCustomerId(orderMaster.getCustomerId()); + orderDetail.setDeptId(orderMaster.getDeptId()); detailIds.forEach(id->{ orderDetailIds.append(id).append(","); }); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 711ab1a4..e85815e5 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -120,7 +120,7 @@ AND om.create_time < #{createTimeEnd} - AND om.id in (#{orderMasterIds}) + AND om.id in (${orderMasterIds}) order by om.create_time