This commit is contained in:
何美荣 2026-07-24 18:09:08 +08:00
parent 1fb8e958c6
commit f391404d5a

View File

@ -11701,7 +11701,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value; var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
var filter = new BaseFilter(orgId); var filter = new BaseFilter(orgId);
filter.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "Nav_User.NAME", "Nav_ChargeUser.NAME" }; 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()) if (departs != null && departs.Any())
{ {
foreach (var depart in departs) foreach (var depart in departs)
@ -12720,6 +12720,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
completions.Add(biSafeFinish); completions.Add(biSafeFinish);
} }
} }
completions = completions.OrderBy(t => t.DEPARTMENT_NAME).ThenBy(m => m.TEAM_NAME).ToList();
return completions; return completions;
}); });
} }