From 7e455a3d008f340ef53f02a719dbe2915262a184 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 17 Jun 2022 14:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E9=98=B3=E6=8E=92=E8=AF=BE=E6=95=B0?= =?UTF-8?q?=E6=8D=AEmysql=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9C=89null=E6=95=B0=E6=8D=AE=E5=81=9A=E6=8E=92?= =?UTF-8?q?=E9=99=A4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 0dec98bcf..063724e29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -1090,7 +1090,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher WHERE semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" - + entity.Semester + "' and a.type='1' "); + + entity.Semester + "' and a.type='1' and teacher.number is not null "); var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync(@"SELECT * FROM TeachClass WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); @@ -1179,7 +1179,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_course cour ON cour.id= p.`course` LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester - + "' AND curr.`ification` ='1' ORDER BY p.`major` "); + + "' AND curr.`ification` ='1' and tt.EmpNo is not null ORDER BY p.`major` "); var majorData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var lessonData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); if (TeachList.Count() > 0)