diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 763fda6..6d3b8c8 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -250,9 +250,10 @@ namespace APT.PP.WebApi.Controllers.Api.PP
             return SafeExecute<bool>(() =>
             {
                 try
-                {
+                {
+                    var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
                     List<T_FM_DEPARTMENT_COMPLETION> completions = new List<T_FM_DEPARTMENT_COMPLETION>();
-                    BaseFilter baseFilter = new BaseFilter(filter.GetOrgId());
+                    BaseFilter baseFilter = new BaseFilter(orgId);
                     var startTime = Convert.ToDateTime(DateTime.Now.AddMonths(-11).Year + "-" + DateTime.Now.AddMonths(-11).Month + "-01 00:00:00");
                     var endTime = Convert.ToDateTime(DateTime.Now.Year + "-" + DateTime.Now.Month + "-" + DateTime.Now.Day + " 23:59:59");
                     baseFilter.SelectField = new string[] { "ID", "NAME", "DEPARTMENT_TYPE", "Nav_Parent.NAME", "PARENT_ID" };
@@ -1076,10 +1077,10 @@ namespace APT.PP.WebApi.Controllers.Api.PP
             return SafeExecute<bool>(() =>
             {
                 try
-                {
-
+                {
+                    var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
                     List<T_FM_WORK_TICKET_COMPLETION> completions = new List<T_FM_WORK_TICKET_COMPLETION>();
-                    BaseFilter baseFilter = new BaseFilter(filter.GetOrgId());
+                    BaseFilter baseFilter = new BaseFilter(orgId);
                     baseFilter.IgnoreDataRule = true;
                     var startTime = Convert.ToDateTime(DateTime.Now.AddMonths(-11).Year + "-" + DateTime.Now.AddMonths(-11).Month + "-01 00:00:00");
                     var endTime = Convert.ToDateTime(DateTime.Now.Year + "-" + DateTime.Now.Month + "-" + DateTime.Now.Day + " 23:59:59");