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 {