diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index d4155060..d49dd15b 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -10,6 +10,7 @@ import com.ghy.common.enums.ImgType;
 import com.ghy.common.enums.OrderStatus;
 import com.ghy.common.enums.PayStatus;
 import com.ghy.common.utils.ExceptionUtil;
+import com.ghy.common.utils.StringUtils;
 import com.ghy.common.utils.poi.ExcelUtil;
 import com.ghy.customer.domain.CustomerAddress;
 import com.ghy.customer.service.CustomerAddressService;
@@ -52,9 +53,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -290,6 +289,7 @@ public class OrderDetailController extends BaseController {
     @ResponseBody
     public TableDataInfo afterServiceList(@RequestBody OrderDetail orderDetail) {
         List<AfterServiceRecord> afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(new AfterServiceRecord());
+        Map<Long, List<AfterServiceRecord>> detailRecordMap = afterServiceRecordList.stream().collect(Collectors.groupingBy(record->record.getOrderDetailId()));
         // 踢重后的子单ids
         List<Long> detailIds =  afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList());
         StringBuilder orderDetailIds = new StringBuilder();
@@ -297,8 +297,10 @@ public class OrderDetailController extends BaseController {
             orderDetailIds.append(id).append(",");
         });
         String ids = orderDetailIds.toString();
-        if(ids.length() > 0){
-            orderDetail.setOrderDetailIds(ids.substring(0, -1));
+        if(StringUtils.isNotEmpty(ids)){
+            orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1));
+        }else {
+            orderDetail.setOrderDetailIds("0");
         }
         startPage();
         List<OrderListResponse> orderListResponses = new ArrayList<>();
@@ -375,6 +377,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setCustomerRemark(orderMaster.getRemark());
             orderListResponse.setOrderType(detail.getOrderType());
             orderListResponse.setIsOverTime(isOverTime);
+            orderListResponse.setAfterServiceRecordList(detailRecordMap.get(detail.getId()));
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);
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 dbd6343c..815702e0 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
@@ -210,8 +210,10 @@ public class OrderMasterController extends BaseController {
             orderDetailIds.append(id).append(",");
         });
         String ids = orderDetailIds.toString();
-        if(ids.length() > 0){
-            orderDetail.setOrderDetailIds(ids.substring(0, -1));
+        if(StringUtils.isNotEmpty(ids)){
+            orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1));
+        }else {
+            orderDetail.setOrderDetailIds("0");
         }
         // 所有售后的子单
         List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
@@ -220,8 +222,11 @@ public class OrderMasterController extends BaseController {
                 .collect(Collectors.toList()).forEach(id->{
                     orderMasterIds.append(id).append(",");
                 });
-        if(orderMasterIds.toString().length()>0){
-            orderMaster.setOrderMasterIds(orderMasterIds.substring(0, -1));
+        String orderIds = orderMasterIds.toString();
+        if(StringUtils.isNotEmpty(orderIds)){
+            orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length()-1));
+        }else {
+            orderMaster.setOrderMasterIds("0");
         }
 
         startPage();
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 0a241a1f..d5640120 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -2,6 +2,7 @@ package com.ghy.web.pojo.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ghy.order.domain.AfterServiceRecord;
 import com.ghy.payment.domain.OrderTimeoutRecord;
 import lombok.Data;
 
@@ -78,4 +79,6 @@ public class OrderListResponse {
 
     private List<String> finishImgList;
 
+    private List<AfterServiceRecord> afterServiceRecordList;
+
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index ffdc02b7..711ab1a4 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 &lt; #{createTimeEnd}
             </if>
             <if test="orderMasterIds != null">
-                AND om.id in (#{orderMasterIds});
+                AND om.id in (#{orderMasterIds})
             </if>
         </where>
         order by om.create_time