update

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -409,15 +409,18 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             if (ListUtil.isNotEmpty(list)) {
                 orderManage.setScheduleManage(list.stream().findAny().orElse(null));
             }
-            orderManage.getListOrderServer().forEach(orderServe -> {
-                if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
-                    orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
-                            orderServe.getStartTime().getTime()) / 1000 / 60);
-                }
-                if (ListUtil.isNotEmpty(orderRecordMap.get(orderServe.getId()))) {
-                    orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
-                }
-            });
+            //兼容遗留数据
+            if (ListUtil.isEmpty(orderManage.getListOrderServer())) {
+                orderManage.getListOrderServer().forEach(orderServe -> {
+                    if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
+                        orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
+                                orderServe.getStartTime().getTime()) / 1000 / 60);
+                    }
+                    if (ListUtil.isNotEmpty(orderRecordMap.get(orderServe.getId()))) {
+                        orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
+                    }
+                });
+            }
         });
 
         return orderManagePage;