diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
index ffe9b89..83bf666 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
@@ -71,6 +71,10 @@ namespace APT.FO.WebApi.Controllers
                 var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
                 entity.APPLY_USER_ID = loginUserId;
                 entity.APPLY_DEPARTMENT_ID = departmentId;
+                if (entity.COMPANY_ID == null)
+                {
+                    entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
+                }
                 var details = entity.Nav_Details;
                 if (details != null && details.Any())
                 {
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
index 809f306..bcccacf 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
@@ -71,6 +71,10 @@ namespace APT.FO.WebApi.Controllers
                 var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
                 entity.APPLY_USER_ID = loginUserId;
                 entity.APPLY_DEPARTMENT_ID = departmentId;
+                if (entity.COMPANY_ID == null)
+                {
+                    entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
+                }
                 var details = entity.Nav_Details;
                 if (details != null && details.Any())
                 {