diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs index a3f3a06..ef0d69c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -8985,20 +8985,22 @@ namespace APT.SC.WebApi.Controllers.Api.BIController public JsonActionResult GetTotalCount([FromBody] KeywordPageFilter pageFilter) { return SafeExecute(() => - { - pageFilter.IgnoreDataRule = true; + { + var newFilter = new KeywordFilter(); + newFilter.OrgId = pageFilter.OrgId; + newFilter.IgnoreDataRule = true; //首页待办增加数量统计字段 dynamic ret = new System.Dynamic.ExpandoObject(); - var ordinaryCount = GetCount(s => !s.IS_DELETED, pageFilter); - var crucialCount = GetCount(s => !s.IS_DELETED, pageFilter); - var activityCount = GetCount(s => !s.IS_DELETED, pageFilter); - var postCount = GetCount(s => !s.IS_DELETED, pageFilter); - var postChangeCount = GetCount(s => !s.IS_DELETED, pageFilter); - var taskCount = GetCount(s => !s.IS_DELETED, pageFilter); - var shiftMeetingCount = GetCount(s => !s.IS_DELETED, pageFilter); - var shiftMeetingFinishCount = GetCount(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, pageFilter); - var postChangeFinishCount = GetCount(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, pageFilter); - var postFinishCount = GetCount(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, pageFilter); + var ordinaryCount = GetCount(s => !s.IS_DELETED, newFilter); + var crucialCount = GetCount(s => !s.IS_DELETED, newFilter); + var activityCount = GetCount(s => !s.IS_DELETED, newFilter); + var postCount = GetCount(s => !s.IS_DELETED, newFilter); + var postChangeCount = GetCount(s => !s.IS_DELETED, newFilter); + var taskCount = GetCount(s => !s.IS_DELETED, newFilter); + var shiftMeetingCount = GetCount(s => !s.IS_DELETED, newFilter); + var shiftMeetingFinishCount = GetCount(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, newFilter); + var postChangeFinishCount = GetCount(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, newFilter); + var postFinishCount = GetCount(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, newFilter); ret.ordinaryCount = ordinaryCount; ret.crucialCount = crucialCount; ret.activityCount = activityCount; @@ -9716,7 +9718,10 @@ namespace APT.SC.WebApi.Controllers.Api.BIController { return completionSorts; } - + else + { + completionSorts = new List(); + } #endregion var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value; //var mineType = 30;