From 9fbf0fe3f6124abcb3fa990294f22544a495b77c Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 23 Aug 2022 10:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86=EF=BC=9A=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=95=99=E5=B8=88=E7=99=BB=E5=BD=95=EF=BC=8C=E4=B8=80?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=EF=BC=8C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=90=8E=E6=89=8D=E5=B1=95=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/MyClass.cshtml                    | 4 ++--
 .../Views/StuInfoBasic/MyClass.js                        | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.cshtml
index 1ffd38a1c..55fb56213 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.cshtml	
+++ b/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">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js
index eca5946ba..fd03c5138 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js	
+++ b/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) });