解决昨日冲突代码

Edu.Module.Course/OrderModule.cs

@@ -1465,7 +1465,22 @@ namespace Edu.Module.Course
                     item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();
                     item.DirectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 4).ToList();
                     item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
-                    item.ContractList = new List<RB_Education_Contract_ViewModel>();
+                    item.ContractList = clist.Where(x => x.OrderId == item.OrderId).ToList();
+                    var ZList = item.GuestList.Where(x => !item.ContractList.Select(z => z.GuestId).Contains(x.Id)).ToList();
+                    if (ZList.Any() && item.ContractList.Any())
+                    {
+                        foreach (var qitem in ZList)
+                        {
+                            item.ContractList.Add(new RB_Education_Contract_ViewModel()
+                            {
+                                Id = 0,
+                                StudentName = qitem.GuestName,
+                                ContractNo = "",
+                                GuestId = qitem.Id,
+                                Status = 0
+                            });
+                        }
+                    }
                 }
             }
             return orderList;