From 956503400c414557f41c8749af5bf383c0a79fa8 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 5 Jun 2024 13:48:24 +0800 Subject: [PATCH] =?UTF-8?q?UserNotificationCount=20=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/NotificationTaskController.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs index 188e09e..7ff4130 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs @@ -65,7 +65,7 @@ namespace APT.FM.WebApi.Controllers.Api } if (pageFilter.Parameter1.Equals("2")) { - result = GetOrderPageEntities(s => s.USER_ID == userId && (s.NOTICE_STATUS == 1 || s.NOTICE_STATUS == 2) && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7 , pageFilter); + result = GetOrderPageEntities(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(null, appFilter, "Nav_Files.Nav_ImgFile.Nav_File"); if (appVersion != null)