From f391404d5a034cd9f62efe5d9de95a35cb70024a 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 18:09:08 +0800
Subject: [PATCH] 1

---
 .../Api/BIController/BIStatiscialAnalysisController.cs     | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 909d770..ef81e14 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -9822,12 +9822,12 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                     }
                 }
                 //List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts1 = completionSorts.OrderByDescending(t => t.CALC).Take(8).ToList();
-                List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts1 = completionSorts.Where(m=>m.CALC!=0).OrderByDescending(t => t.CALC).ToList();
+                List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts1 = completionSorts.Where(m=>m.CALC!=0).OrderByDescending(t => t.CALC).ToList();
                 if (!string.IsNullOrEmpty(filter.Parameter1))
                 {
                     var param = int.Parse(filter.Parameter1.ToString());
                     completionSorts1 = completionSorts1.OrderByDescending(t => t.CALC).Take(param).ToList();
-                }
+                }
                 int i = 1;
                 foreach (var item in completionSorts1)
                 {
@@ -11701,7 +11701,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                 var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
                 var filter = new BaseFilter(orgId);
                 filter.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "Nav_User.NAME", "Nav_ChargeUser.NAME" };
-                var departs = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED, filter);
+                var departs = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, filter);
                 if (departs != null && departs.Any())
                 {
                     foreach (var depart in departs)
@@ -12720,6 +12720,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                         completions.Add(biSafeFinish);
                     }
                 }
+                completions = completions.OrderBy(t => t.DEPARTMENT_NAME).ThenBy(m => m.TEAM_NAME).ToList();
                 return completions;
             });
         }