From 1a30ef6ca5f22563a29a44a992c40e9e286eca3c Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 11:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E9=80=9A=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=20=E6=8E=92=E5=BA=8F;=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E7=9C=8B=E4=B8=80=E5=8D=A1=E9=80=9A=E6=B5=81?= =?UTF-8?q?=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 {