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

Edu.Module.Finance/FinanceModule.cs

@@ -3518,7 +3518,7 @@ namespace Edu.Module.Finance
             var rclist = new List<Model.ViewModel.Reserve.RB_Reserve_Class_Extend>();
             if (pageSize == 1000 || pageSize == 10000) {
                 //查询试听课
-                rclist = reserve_ClassRepository.GetTeacherHoursDetialList(teacherId.ToString(), schoolId, 0, startMonth, endMonth, groupId);
+                rclist = reserve_ClassRepository.GetTeacherHoursDetialList(teacherId > 0 ? teacherId.ToString() : "", schoolId, 0, startMonth, endMonth, groupId);
             }
             if (list.Any() || rclist.Any()) {
                 //班级类型查询
@@ -3669,7 +3669,7 @@ namespace Edu.Module.Finance
             //根据学生签到表  查询
             var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(teacherId.ToString(), schoolId, classId, startMonth, endMonth, groupId);
             //查询试听课
-            var rclist = reserve_ClassRepository.GetTeacherHoursDetialList(teacherId.ToString(), schoolId, 0, startMonth, endMonth, groupId);
+            var rclist = reserve_ClassRepository.GetTeacherHoursDetialList(teacherId > 0 ? teacherId.ToString() : "", schoolId, 0, startMonth, endMonth, groupId);
             if (list.Any() || rclist.Any())
             {
                 //班级类型查询