页面修改

Edu.Repository/Course/RB_ClassRepository.cs

@@ -339,10 +339,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
                 }
-                //if (query.School_Id > 0)
-                //{
-                //    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
-                //}
+                if (query.School_Id > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
+                }
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -40,7 +40,6 @@ namespace Edu.WebApi.Controllers.Course
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var dmodel = new RB_Class_ViewModel()
             {
-                School_Id = base.ParmJObj.GetInt("School_Id"),
                 ClassName = base.ParmJObj.GetStringValue("ClassName"),
                 ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
@@ -51,6 +50,12 @@ namespace Edu.WebApi.Controllers.Course
                 JoinStartTime = base.ParmJObj.GetStringValue("JoinStartTime"),
                 JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime")
             };
+            var schoolId = base.ParmJObj.GetStringValue("School_Id");
+            if (!string.IsNullOrEmpty(schoolId))
+            {
+                dmodel.School_Id = base.ParmJObj.GetInt("School_Id");
+            }
+
             dmodel.Group_Id = userInfo.Group_Id;
             var list = orderModule.GetClassPruductListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);

Edu.WebApi/Controllers/Web/WebController.cs

@@ -458,6 +458,7 @@ namespace Edu.WebApi.Controllers.Web
                 Teacher_Id = base.ParmJObj.GetInt("Teacher_Id"),
                 Group_Id = base.ParmJObj.GetInt("Group_Id"),
                 CateId = base.ParmJObj.GetInt("CateId"),
+                School_Id = -1,
             };
             if (dmodel.Group_Id <= 0)
             {