diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
index 977e7ec..a8181e5 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
@@ -48,9 +48,9 @@ namespace APT.FO.WebApi.Controllers
                 var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
                 if (string.IsNullOrEmpty(id))
                     this.ThrowError("060010");
-                var entity = this.GetEntity<T_FO_FIRE_JOB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File", "Nav_FireDepartment",
-                    "Nav_SafeUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File", "Nav_Area", "Nav_Type", "Nav_MonitorUser", "Nav_Risks", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_Users.Nav_UserType", "Nav_Users.Nav_User", "Nav_Users.Nav_UserFiles.Nav_ImgFile.Nav_File",
-                    "Nav_FireFiles.Nav_ImgFile.Nav_File", "Nav_MonitorFiles.Nav_ImgFile.Nav_File", "Nav_DispatchUser");
+                var entity = this.GetEntity<T_FO_FIRE_JOB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_FireDepartment",
+                    "Nav_SafeUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", "Nav_Users.Nav_UserType", "Nav_Users.Nav_User.Nav_UserSignFiles.Nav_ImgFile", "Nav_Users.Nav_UserFiles.Nav_ImgFile",
+                    "Nav_FireFiles.Nav_ImgFile", "Nav_MonitorFiles.Nav_ImgFile", "Nav_DispatchUser.Nav_UserSignFiles.Nav_ImgFile");
                 if (entity != null)
                 {
                     var details = this.GetEntities<T_FO_FIRE_JOB_DETAIL>(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList();
@@ -279,7 +279,7 @@ namespace APT.FO.WebApi.Controllers
                             throw new Exception("动火实际结束时间必须填写");
                         if (entity.LEAVE_DATE == null)
                             throw new Exception("离开现场时间必须填写");
-                    if (entity.Nav_MonitorFiles == null|| !entity.Nav_MonitorFiles.Any())
+                        if (monitorFileList == null || !monitorFileList.Any())
                             throw new Exception("必须上传完工验收附件，如照片视频等");
                         var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false));
                         if (detailNeed != null)
@@ -311,7 +311,7 @@ namespace APT.FO.WebApi.Controllers
                             throw new Exception("不可动火请稍后再进行验收");
                         if (entity.ACT_DATE == null)
                             throw new Exception("动火实际开始时间必须填写");
-                        if (entity.Nav_FireFiles == null || !entity.Nav_FireFiles.Any())
+                        if (fireFileList == null || !fireFileList.Any())
                             throw new Exception("必须上传现场条件验收附件，如照片视频等");
                         var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false);
                         if (detailNeed != null)
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
index 8e72bcf..1e1704a 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
@@ -46,10 +46,10 @@ namespace APT.FO.WebApi.Controllers
                 var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
                 if (string.IsNullOrEmpty(id))
                     this.ThrowError("060010");
-                var entity = this.GetEntity<T_FO_FIRE_JOB_WB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_ImgFile.Nav_File",
-                    "Nav_SafeUser.Nav_ImgFile.Nav_File", "Nav_Area", "Nav_Type", "Nav_MonitorUser", "Nav_Risks", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_Users.Nav_UserType", "Nav_Users.Nav_UserFiles.Nav_ImgFile.Nav_File",
-                    "Nav_Users.Nav_Signs.Nav_ImgFile.Nav_File",
-                    "Nav_FireFiles.Nav_ImgFile.Nav_File", "Nav_MonitorFiles.Nav_ImgFile.Nav_File");
+                var entity = this.GetEntity<T_FO_FIRE_JOB_WB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_Related", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_ImgFile",
+                    "Nav_SafeUser.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", "Nav_Users.Nav_UserType", "Nav_Users.Nav_UserFiles.Nav_ImgFile",
+                    "Nav_Users.Nav_Signs.Nav_ImgFile", "Nav_Users.Nav_User",
+                    "Nav_FireFiles.Nav_ImgFile", "Nav_MonitorFiles.Nav_ImgFile");
                 if (entity != null)
                 {
                     var details = this.GetEntities<T_FO_FIRE_JOB_WB_DETAIL>(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList();
@@ -302,7 +302,7 @@ namespace APT.FO.WebApi.Controllers
                             throw new Exception("动火实际结束时间必须填写");
                         if (entity.LEAVE_DATE == null)
                             throw new Exception("离开现场时间必须填写");
-                        if (entity.Nav_MonitorFiles == null || !entity.Nav_MonitorFiles.Any())
+                        if (monitorFileList == null || !monitorFileList.Any())
                             throw new Exception("必须上传完工验收附件，如照片视频等");
                         var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false));
                         if (detailNeed != null)
@@ -325,7 +325,7 @@ namespace APT.FO.WebApi.Controllers
                             throw new Exception("不可动火请稍后再进行验收");
                         if (entity.ACT_DATE == null)
                             throw new Exception("动火实际开始时间必须填写");
-                        if (entity.Nav_FireFiles == null || !entity.Nav_FireFiles.Any())
+                        if (fireFileList == null || !fireFileList.Any())
                             throw new Exception("必须上传现场条件验收附件，如照片视频等");
                         var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false);
                         if (detailNeed != null)