From feb795c0b40489b4d02cbf72f5aac595072022f2 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 17 Aug 2021 17:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=BD=95=E5=8F=96=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B4=E7=BA=A7=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuEnroll/Index.cshtml                          | 2 +-
 .../EducationalAdministration/Views/StuEnroll/Index.js    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml
index ca74e6a86..55aa697aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml	
@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
index f7c5ece23..87a783068 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js	
@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
@@ -475,7 +475,11 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.Grade = "20";
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = "20";
+            }
+
+            //param.Grade = "20";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };