From d4b7ab4a7e13f2ee05c98a2702ec7bf2d0f1c8c0 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 15 Mar 2023 09:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BF=AE=E5=90=88=E7=8F=AD=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE--=E7=AE=A1=E7=90=86=E5=90=88=E7=8F=AD=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=9B=E7=AE=A1=E7=90=86=E5=90=88=E7=8F=AD=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=90=8E=E6=A0=B9=E6=8D=AE=E5=A4=9A=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/ElectiveMerge/Index.js  | 6 +++++-
 .../Views/OpenLessonPlanOfElective/Index.js                 | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js
index 6d7ff363b..9ea787362 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js	
@@ -169,7 +169,11 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function () {
-        page.search();
+        var param = {};
+        param.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+        param.Semester = $('#Semester').lrselectGet();
+        param.LessonName = $('#LessonName').lrselectGet();
+        page.search(param);
     };
     page.init();
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js
index 86dc7a8d9..9bd517a48 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js	
@@ -119,8 +119,8 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'Id',
                 isPage: true,
-                sidx: 'AcademicYearNo,Semester',
-                sord: 'desc',
+                sidx: 'AcademicYearNo desc,Semester desc,LessonName asc,EmpName asc,LessonSection asc',
+                //sord: 'desc',
                 isMultiselect: true
             });
             page.search();