选修课选课：专业、年级的限制

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -95,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id 
 	                              left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo
                                   left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
-	                               where 1=1 ");
+	                               where 1=1 and a.MajorId is not null and a.Grade is not null ");
                 //学号
                 if (!queryParam["StuNo"].IsEmpty())
                 {
@@ -106,18 +106,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuMajorNo", queryParam["StuMajorNo"].ToString(), DbType.String);
                     strSql.Append(" and a.MajorId=@StuMajorNo ");
                 }
+                else
+                {
+                    strSql.Append(" and a.MajorId='' ");
+                }
                 if (!queryParam["StuGrade"].IsEmpty())
                 {
                     dp.Add("StuGrade", queryParam["StuGrade"].ToString(), DbType.String);
                     strSql.Append(" and a.Grade=@StuGrade ");
                 }
+                else
+                {
+                    strSql.Append(" and a.Grade='' ");
+                }
                 //教学工作安排中“选课”工作设置的学年学期
                 var now = DateTime.Now;
                 var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1");
                 if (EADateArrangeEntityAboutElective != null)
                 {
                     strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "'");
-                    strSql.Append(" and b.LessonName not in(select LessonName from StuSelectLessonListOfElective where AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and StuNo='"+ queryParam["StuNo"].ToString() + "' and Status<>3)");
+                    strSql.Append(" and b.LessonName not in(select LessonName from StuSelectLessonListOfElective where AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and StuNo='" + queryParam["StuNo"].ToString() + "' and Status<>3)");
                 }
                 else
                 {