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

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -313,10 +313,10 @@ WHERE  a.`Status`=0 and DATE_FORMAT(a.ClassDate,'%Y-%m-%d')<=DATE_FORMAT(NOW(),'
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                //}
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -732,7 +732,7 @@ namespace Edu.WebApi.Controllers.Course
             var classPlanId = base.ParmJObj.GetInt("ClassPlanId");
             var schoolId = base.ParmJObj.GetInt("School_Id");
             var ClassTimeId = base.ParmJObj.GetInt("ClassTimeId");
-            if (classId == 0 || classPlanId == 0 || schoolId == 0)
+            if (classId == 0 || classPlanId == 0 )
             {
                 return ApiResult.ParamIsNull();
             }