ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UserNotificationCount 报错处理

Browse Source
This commit is contained in:
wyw 2024-06-05 13:48:24 +08:00
parent 621a2584eb
commit 956503400c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -65,7 +65,7 @@ namespace APT.FM.WebApi.Controllers.Api
}
if (pageFilter.Parameter1.Equals("2"))
{
result = GetOrderPageEntities<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && (s.NOTICE_STATUS == 1 || s.NOTICE_STATUS == 2) && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7 , pageFilter);
result = GetOrderPageEntities<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && (s.NOTICE_STATUS == 1 || s.NOTICE_STATUS == 2) && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7, pageFilter);
}
if (pageFilter.Parameter1.Equals("3") && todayNewCount > 0)
{
@ -158,8 +158,21 @@ namespace APT.FM.WebApi.Controllers.Api
var appFilter = new BaseFilter(filter.OrgId);
appFilter.Order = DbOrder.DESC;
appFilter.Sort = "CREATE_TIME";
//查询指定租户
appFilter.SpecifyTenant = "0001";
//查询指定租户
string Tenant = "00001";
// wyw 改为动态获取
if (HttpContext.Request.Headers.ContainsKey("Tenant") || HttpContext.Request.Headers.ContainsKey("tenant"))
{
try
{
Tenant = HttpContext.Request.Headers["Tenant"];
}
catch
{
Tenant = HttpContext.Request.Headers["tenant"];
}
}
appFilter.SpecifyTenant = Tenant;
appFilter.IsSpecifyDb = true;
var appVersion = this.GetEntity<T_PF_APP_VERSION>(null, appFilter, "Nav_Files.Nav_ImgFile.Nav_File");
if (appVersion != null)