Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.cshtml

@@ -5,14 +5,14 @@
 <div class="lr-layout lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
-            <div class="lr-layout-title lrlt ">树形列表</div>
+            <div class="lr-layout-title lrlt ">班级列表</div>
             <div id="dataTree" class="lr-layout-body"></div>
         </div>
     </div>
     <div class="lr-layout-center">
         <div class="lr-layout-wrap  ">
             <div class="lr-layout-title">
-                <span id="titleinfo" class="lrlt">列表信息</span>
+                <span id="titleinfo" class="lrlt">学生列表信息</span>
             </div>
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js

@@ -48,7 +48,8 @@ var bootstrap = function ($, learun) {
                         label: "出生日期", name: "Birthday", width: 100, align: "left",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        } },
+                        }
+                    },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "left",
@@ -170,6 +171,12 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         search: function (param) {
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {//登录用户是system时，列表展示所有学生；其他用户登录时，必须选择左侧班级才能查看学生；
+                if (Class == "" || Class == undefined || Class == null) {
+                    learun.alert.warning("请选择左侧班级！");
+                    return false;
+                }
+            }
             param = param || {};
             param.ClassNo = Class;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });