From ddb6fae3db5d9190557571612b92da7e95d28e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 24 Jul 2026 10:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BIStatiscialAnalysisController.cs         | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

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<dynamic> GetTotalCount([FromBody] KeywordPageFilter pageFilter)
         {
             return SafeExecute<dynamic>(() =>
-            {
-                pageFilter.IgnoreDataRule = true;
+            {
+                var newFilter = new KeywordFilter();
+                newFilter.OrgId = pageFilter.OrgId;
+                newFilter.IgnoreDataRule = true;
                 //首页待办增加数量统计字段
                 dynamic ret = new System.Dynamic.ExpandoObject();
-                var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED, pageFilter);
-                var crucialCount = GetCount<T_FO_CRUCIAL_LICENSE_JOB>(s => !s.IS_DELETED, pageFilter);
-                var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED, pageFilter);
-                var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED, pageFilter);
-                var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED, pageFilter);
-                var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED, pageFilter);
-                var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED, pageFilter);
-                var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, pageFilter);
-                var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, pageFilter);
-                var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, pageFilter);
+                var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED, newFilter);
+                var crucialCount = GetCount<T_FO_CRUCIAL_LICENSE_JOB>(s => !s.IS_DELETED, newFilter);
+                var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED, newFilter);
+                var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED, newFilter);
+                var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED, newFilter);
+                var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED, newFilter);
+                var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED, newFilter);
+                var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, newFilter);
+                var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, newFilter);
+                var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(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<T_FM_DEPARTMENT_COMPLETION_SORT>();
+                }
                 #endregion
                 var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
                 //var mineType = 30;