Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/OrderModule.cs

@@ -2774,7 +2774,7 @@ namespace Edu.Module.Course
         {
             var gmodel = order_GuestRepository.GetEntity(guestId);
             if (gmodel == null) { return false; }
-            var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id }).Where(x => x.Status != 4).FirstOrDefault();
+            var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id, Status = -1 }).Where(x => x.Status != 4).FirstOrDefault();
             if (cmodel != null)
             {
                 //有合同

Edu.Module.Course/OrderModule2.cs

@@ -191,10 +191,11 @@ namespace Edu.Module.Course
                 {
                     FinaceNum = string.Join(",", flist.Select(qitem => qitem.FrID));
                 }
-                var contractModel= education_ContractRepository.GetList(new RB_Education_Contract_ViewModel()
+                var contractModel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel()
                 {
                     OrderId = OrderId,
-                    GuestId = GuestId
+                    GuestId = GuestId,
+                    Status = -1
                 })?.FirstOrDefault();
                 string ProtocolNum = (contractModel?.ContractNo ?? "") + "-T";
                 RB_BackClass_Protocol model = new RB_BackClass_Protocol()