From 8f434f94129479e860ee84a1422f8981384c95a2 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 09:53:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E7=8F=AD=E4=B8=BB=E4=BB=BB=E8=AE=BE?= =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/ClassInfo/Form.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml index abf2c24ad..9c0c6407f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml @@ -32,8 +32,8 @@
-
班主任
-
+
班主任*
+
辅导员
From a51a3f15334163a715bdb64095934293b6dbcbe9 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 23 Aug 2022 10:08:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A5=96=E5=8A=B1=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=84=E5=88=86=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEncourgement/Index.cshtml | 22 +++++++++++++++++++ .../Views/StuEncourgement/Index.js | 3 +++ .../Views/StuPunishment/Index.cshtml | 22 +++++++++++++++++++ .../Views/StuPunishment/Index.js | 5 +++++ .../StuEncourgement/StuEncourgementService.cs | 10 +++++++++ .../StuPunishment/StuPunishmentService.cs | 11 ++++++++++ 6 files changed, 73 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml index 82c9e514b..48982f154 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml @@ -7,6 +7,28 @@
+
+
+
+
+
学号
+ +
+
+
姓名
+ +
+
+
奖励名称
+ +
+
+
奖励日期
+ +
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js index 1960822bb..8b5acb4bb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js @@ -13,6 +13,9 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 300, 400); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml index ca70f343d..67c53874f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml @@ -7,6 +7,28 @@
+
+
+
+
+
学号
+ +
+
+
姓名
+ +
+
+
处分名称
+
+
+
+
处分日期
+ +
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js index beac0586f..9562bac1f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js @@ -13,6 +13,11 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 300, 400); + $('#PunishNo').lrDataItemSelect({ code: 'Punishment' }); + // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs index 3157c8526..3f3de8b01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs @@ -77,6 +77,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); strSql.Append(" AND t.ClassNo = @ClassNo "); } + if (!queryParam["EncourgeName"].IsEmpty()) + { + dp.Add("EncourgeName", "%" + queryParam["EncourgeName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.EncourgeName Like @EncourgeName "); + } + if (!queryParam["EncourgeDate"].IsEmpty()) + { + dp.Add("EncourgeDate", queryParam["EncourgeDate"].ToString(), DbType.String); + strSql.Append(" AND t.EncourgeDate = @EncourgeDate "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs index 2193eb19f..2ec5e0fa2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs @@ -71,6 +71,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); strSql.Append(" AND t.ClassNo = @ClassNo "); } + + if (!queryParam["PunishNo"].IsEmpty()) + { + dp.Add("PunishNo", queryParam["PunishNo"].ToString(), DbType.String); + strSql.Append(" AND t.PunishNo = @PunishNo "); + } + if (!queryParam["PunishDate"].IsEmpty()) + { + dp.Add("PunishDate", queryParam["PunishDate"].ToString(), DbType.String); + strSql.Append(" AND t.PunishDate = @PunishDate "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) From 90a887d52d8062dc3a3cbbfa5ce251347707cad0 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 23 Aug 2022 10:17:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8C=89=E9=92=AE=E2=80=9C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E2=80=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/ClassInfo/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml index 8e87fe741..710753557 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml @@ -47,7 +47,7 @@ @* 班级类型设定*@
-  查看学生 + @* 查看学生*@  班主任/辅导员安排
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 4/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=95=99=E5=B8=88=E7=99=BB=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E4=B8=80=E5=BC=80=E5=A7=8B=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=8F=AD=E7=BA=A7=E5=90=8E=E6=89=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=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 @@
-
树形列表
+
班级列表
- 列表信息 + 学生列表信息
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) }); From c42a49786bff2c2257f90f58716ae9456fa24711 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 23 Aug 2022 10:46:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=A4=A7=E8=84=91?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCollection/DataCollectionService.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs index c24eb19b4..0beba6344 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs @@ -78,9 +78,12 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop var login_res_str = HttpMethods.Get(login_url); var login_res = JsonConvert.DeserializeObject(login_res_str); var login_data = login_res.data; - _redis.Write($"access_token", ((dynamic)login_data)?.access_token, TimeSpan.FromSeconds(200)); - _redis.Write($"client_secret", ((dynamic)login_data)?.client_secret, TimeSpan.FromSeconds(160000)); - _redis.Write($"refresh_token", ((dynamic)login_data)?.refresh_token, TimeSpan.FromSeconds(250)); + string access_token = ((dynamic)login_data)?.access_token; + string client_secret = ((dynamic)login_data)?.client_secret; + string refresh_token = ((dynamic)login_data)?.refresh_token; + _redis.Write($"access_token", access_token, TimeSpan.FromSeconds(200)); + _redis.Write($"client_secret", client_secret, TimeSpan.FromSeconds(160000)); + _redis.Write($"refresh_token", refresh_token, TimeSpan.FromSeconds(250)); } /// /// 刷新token @@ -101,8 +104,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop login(); return; } - _redis.Write($"access_token", ((dynamic)refresh_res)?.access_token, TimeSpan.FromSeconds(200)); - _redis.Write($"refresh_token", ((dynamic)refresh_res)?.refresh_token, TimeSpan.FromSeconds(250)); + string atoken = ((dynamic)refresh_res)?.access_token; + string rtoken = ((dynamic)refresh_res)?.refresh_token; + _redis.Write($"access_token", atoken, TimeSpan.FromSeconds(200)); + _redis.Write($"refresh_token", rtoken, TimeSpan.FromSeconds(250)); } /// /// 校区基础数据 From 6551e3f63f27c5cba9c1c718f7784fd36eaa1a4e Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 23 Aug 2022 11:05:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=A4=A7=E8=84=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LR_Desktop/DataCollection/DataCollectionService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs index 0beba6344..5886d116a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs @@ -44,8 +44,8 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop { try { - var refresh_token = _redis.Read("refresh_token"); - var access_token = _redis.Read("access_token"); + var refresh_token = _redis.Read("refresh_token") == "null" ? "" : _redis.Read("refresh_token"); + var access_token = _redis.Read("access_token") == "null" ? "" : _redis.Read("access_token"); if (string.IsNullOrEmpty(refresh_token) || string.IsNullOrEmpty(_redis.Read("access_token"))) { //用户授权 @@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop private void login() { var login_url = InsUrl + "/prod-api/api/web/collect/oauth2/login?grant_type=password&client_id=" + client_id + "&username=" + username + "&password=" + password; - var login_res_str = HttpMethods.Get(login_url); + var login_res_str = HttpMethods.Post(login_url); var login_res = JsonConvert.DeserializeObject(login_res_str); var login_data = login_res.data; string access_token = ((dynamic)login_data)?.access_token; @@ -95,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop var refresh_url = InsUrl + "/prod-api/api/web/collect/oauth2/refresh?grant_type=refresh_token&client_id=" + client_id + "&client_secret=" + client_secret + "&refresh_token=" + refresh_token; - var refresh_res_str = HttpMethods.Get(refresh_url); + var refresh_res_str = HttpMethods.Post(refresh_url); var refresh_res = JsonConvert.DeserializeObject(refresh_res_str); if (refresh_res == null || ((dynamic)refresh_res)?.code != 200) { From 1a30ef6ca5f22563a29a44a992c40e9e286eca3c Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 11:36:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E9=80=9A=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=20=E6=8E=92=E5=BA=8F;=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E4=B8=80=E5=8D=A1=E9=80=9A?= =?UTF-8?q?=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/MealCardRunTabApi.cs | 1 + .../MealCardRunTab/MealCardRunTabService.cs | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs index cfb5eaa8a..cf057c78d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs @@ -48,6 +48,7 @@ namespace Learun.Application.WebApi { ReqPageParam parameter = this.GetReqData(); var data = mealCardRunTabIBLL.GetPageList(parameter.pagination, parameter.queryJson); + data = data.OrderByDescending(x => x.centralTm); var jsonData = new { rows = data, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index e9c8d7aa8..f4447cc5e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -164,11 +164,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["accountName"].IsEmpty()) { - var IsPhone = queryParam["IsPhone"].ToString(); - if (IsPhone == "0") + var IsPhone = ""; + if (!queryParam["IsPhone"].IsEmpty()) { - dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String); - strSql.Append(" AND t.accountName = @accountName "); + IsPhone = queryParam["IsPhone"].ToString(); + if (IsPhone == "0") + { + var accountName = queryParam["accountName"].ToString(); + if (accountName != "超级管理员") + { + dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String); + strSql.Append(" AND t.accountName = @accountName "); + } + } } else {