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

Edu.Module.Course/OrderModule.cs

@@ -189,7 +189,7 @@ namespace Edu.Module.Course
                 if (demodel.PreferPrice != demodel.Unit_Price * demodel.GuestNum){
                     return ApiResult.Failed("应收总额不正确");
                 }
-                var trans = classRepository.DbTransaction;
+                var trans = orderRepository.DbTransaction;
                 try
                 {
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {

Edu.Repository/User/RB_AccountRepository.cs

@@ -81,7 +81,7 @@ WHERE 1=1
                 }
                 if (query.AccountType > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Account_ViewModel.AccountType), query.AccountType);
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Account_ViewModel.AccountType), (int)query.AccountType);
                 }
                 if (query.School_Id > 0)
                 {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -368,7 +368,8 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult GetClassStudent()
         {
             var classId = base.ParmJObj.GetInt("ClassId");
-            var schoolId = base.ParmJObj.GetInt("School_Id");
+            var schoolId = 0;
+            //var schoolId = base.ParmJObj.GetInt("School_Id");
             var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id);
             return ApiResult.Success(data: data);
         }
@@ -405,7 +406,7 @@ namespace Edu.WebApi.Controllers.Course
                     }
                 }
             }
-            var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId });
+            var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id =0, ClassId = data.ClassId });
             var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
             List<object> guestList = new List<object>();
             foreach (var item in orderGuestList.Where(x => x.GuestState == 1))