From dabd0e8d72ee374621067961d93395bf028f3d45 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Thu, 24 Aug 2023 14:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=AD=A6=E7=94=9F=E6=89=93=E5=8D=A1=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=B9=E5=BD=93=E5=A4=A9=E5=BF=85=E4=BF=AE=E5=92=8C?=
 =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=8A=82?=
 =?UTF-8?q?=E6=AC=A1=E6=8E=92=E5=BA=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADR_Restriction/ADR_RestrictionService.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/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs
index 01baec325..34f08891b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs	
@@ -1464,7 +1464,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 //当天课程
                 //必修课
                 var lessons = BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(m => m.AcademicYearNo == say.AcademicYearShort && m.Semester == say.Semester
-                                   && m.DeptNo == stuInfoBasic.DeptNo && m.MajorNo == stuInfoBasic.MajorNo && m.TeachClassNo.Contains(stuInfoBasic.ClassNo) && m.LessonDate.Value == datenowdatetime);
+                                   && m.DeptNo == stuInfoBasic.DeptNo && m.MajorNo == stuInfoBasic.MajorNo && m.TeachClassNo.Contains(stuInfoBasic.ClassNo) && m.LessonDate.Value == datenowdatetime).OrderBy(x => x.LessonTime);
                 //当前打卡课程判断
                 foreach (var arrangeLessonTermEntity in lessons)
                 {
@@ -1534,7 +1534,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 left join ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId 
 				where a.AcademicYearNo = '{say.AcademicYearShort}' and a.Semester = '{say.Semester}'
                 and a.LessonDate = '{datenow}'
-                and a.CheckMark = '1' ");
+                and a.CheckMark = '1' ").OrderBy(x => Convert.ToInt32(x.LessonSection.Substring(1)));
                 //当前打卡课程判断
                 foreach (var arrangeLessonTermEntity in lessonelective)
                 {