diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 957ab2b27..50599ecda 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -40,18 +40,72 @@ var bootstrap = function ($, learun) {
                 text: "majorname",
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
-                        });
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades) {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "'" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1" }
+                            });
+                        }
                     } else {
-                        $('#ClassNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos) {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "'" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "'" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1" }
+                            });
+                        }
                     }
                 }
             });
@@ -62,11 +116,7 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: "value",
-                text: "text",
-            });
+
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });