页面修改

Edu.Module.Course/OrderModule.cs

@@ -1465,6 +1465,7 @@ 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>();
                 }
             }
             return orderList;

Edu.Module.Public/PublicModule.cs

@@ -54,7 +54,6 @@ namespace Edu.Module.Public
                 List<WhereHelper> whereHelpers = new List<WhereHelper>()
                 {
                     new WhereHelper(){ FiledName=nameof(RB_File_Store.Group_Id),FiledValue=model.Group_Id ,OperatorEnum=OperatorEnum.Equal},
-                    new WhereHelper(){ FiledName=nameof(RB_File_Store.School_Id),FiledValue=model.School_Id, OperatorEnum=OperatorEnum.Equal },
                     new WhereHelper(){ FiledName=nameof(RB_File_Store.ID),FiledValue=id, OperatorEnum=OperatorEnum.NotEqual },
                 };
                 result = storeRepository.Update(fileds, whereHelpers);

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -912,7 +912,8 @@ namespace Edu.WebApi.Controllers.Course
             var orderList = orderModule.GetMyOrderPageList(pageModel.PageIndex, pageModel.PageSize, out long count, demodel);
             var orderS = orderModule.GetMyOrderStatistics(demodel);
             pageModel.Count = Convert.ToInt32(count);
-            pageModel.PageData = new {
+            var obj = new
+            {
                 Statistics = new
                 {
                     PreferPrice = orderS?.PreferPrice ?? 0,
@@ -923,7 +924,7 @@ namespace Edu.WebApi.Controllers.Course
                     CommissionMoney = orderS?.CommissionMoney ?? 0,
                     ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0
                 },
-                List = orderList.Select(x => new
+                List = orderList?.Select(x => new
                 {
                     x.OrderId,
                     x.ClassId,
@@ -950,46 +951,46 @@ namespace Edu.WebApi.Controllers.Course
                     x.ExtraDeductMoney,
                     x.IsCommissionGive,
                     CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
-                    x.SaleRemark,
-                    x.TeacherRemark,
-                    x.RectorRemark,
-                    x.DirectorRemark,
+                    SaleRemark = x?.SaleRemark ?? "",
+                    TeacherRemark = x?.TeacherRemark ?? "",
+                    RectorRemark = x?.RectorRemark ?? "",
+                    DirectorRemark = x?.DirectorRemark ?? "",
                     x.OfferId,
-                    SaleRemarkList = x.SaleRemarkList.Select(z => new
+                    SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,
                         z.Content,
                         CreateBy = z.CreateByName,
                         CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
                     }),
-                    TeacherRemarkList = x.TeacherRemarkList.Select(z => new
+                    TeacherRemarkList = x?.TeacherRemarkList.Select(z => new
                     {
                         z.Id,
                         z.Content,
                         CreateBy = z.CreateByName,
                         CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
                     }),
-                    RectorRemarkList = x.RectorRemarkList.Select(z => new
+                    RectorRemarkList = x?.RectorRemarkList.Select(z => new
                     {
                         z.Id,
                         z.Content,
                         CreateBy = z.CreateByName,
                         CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
                     }),
-                    DirectorRemarkList = x.DirectorRemarkList.Select(z => new
+                    DirectorRemarkList = x?.DirectorRemarkList.Select(z => new
                     {
                         z.Id,
                         z.Content,
                         CreateBy = z.CreateByName,
                         CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
                     }),
-                    GuestList = x.GuestList.Select(z => new
+                    GuestList = x?.GuestList.Select(z => new
                     {
                         z.Id,
                         z.GuestName,
                         z.GuestState
                     }),
-                    ContractList = x.ContractList.Select(z => new {
+                    ContractList = x?.ContractList.Select(z => new {
                         z.Id,
                         z.StudentName,
                         z.ContractNo,
@@ -998,6 +999,7 @@ namespace Edu.WebApi.Controllers.Course
                     })
                 })
             };
+            pageModel.PageData = obj;
             return ApiResult.Success("", pageModel);
         }