diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs index 2f74254..fd0d125 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs @@ -54,9 +54,10 @@ namespace APT.FM.WebApi.Controllers.Api order2.Field = "TASK_STARTDT"; order2.Order = DbOrder.DESC; pageFilter.Orders.Add(order2); - pageFilter.OrgId = null; + //pageFilter.OrgId = null; pageFilter.IgnoreOrgRule = true; var bear = new BaseFilter(); + bear.OrgId = pageFilter.OrgId; bear.IgnoreOrgRule = true; var todoCount = GetCount(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7 && s.TASK_ENDDT >= DateTime.Now.AddMonths(-3), bear); var todayNewCount = GetCount(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && (s.NOTICE_TYPE == 2 || s.NOTICE_TYPE == 7), bear);//&& s.TASK_STARTDT > shortToday