diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index b50e78457..39666bc5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -929,8 +929,8 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + " insertDatastuselect.LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonSortNo; insertDatastuselect.StuSortNo = "02"; insertDatastuselect.Grade = stu.Grade; - insertDatastuselect.StudyScore = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore; - insertDatastuselect.TotalStudyHour = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).TotalStudyHour == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).TotalStudyHour; + insertDatastuselect.StudyScore = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.StudyScore == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.StudyScore; + insertDatastuselect.TotalStudyHour = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.TotalStudyHour == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.TotalStudyHour; insertDatastuselect.IsInEffect = "1"; insertDatastuselect.EmpNo = itemteachclass.EmpNo; insertDatastuselect.IsPitchOn = "1"; @@ -945,7 +945,7 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + " m.LessonNo == insertDatastuselect.LessonNo && m.Grade == insertDatastuselect.Grade && m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo && - m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo&& + m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo && m.F_SchoolId == insertDatastuselect.F_SchoolId) == 0 && insertStuSelectLessonListDataList.Count(m => m.StuNo == insertDatastuselect.StuNo && m.AcademicYearNo == insertDatastuselect.AcademicYearNo && m.Semester == insertDatastuselect.Semester && @@ -954,7 +954,7 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + " m.LessonNo == insertDatastuselect.LessonNo && m.Grade == insertDatastuselect.Grade && m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo && - m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo&& + m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo && m.F_SchoolId == insertDatastuselect.F_SchoolId) == 0) { insertStuSelectLessonListDataList.Add(insertDatastuselect);