diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 53a167f..1c9b5bc 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -12284,7 +12284,7 @@ namespace APT.BaseData.Services.DomainServices
             }
             else
             {
-                var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
+                var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Question");
                 entity.STATUS = PFStandardStatus.Archived;
                 //如果是重大隐患，触发销号表给安全总监
                 var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全总监"));
@@ -12302,13 +12302,14 @@ namespace APT.BaseData.Services.DomainServices
                     else
                     {
                         //否则新增
+                        major = new T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE();
                         major.ORG_ID = entity.ORG_ID;
                         major.STATUS = PFStandardStatus.Draft;
                         major.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
                         major.APPLY_USER_ID = user.ID;
                         major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
                         major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
-                        major.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
+                        major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
                     }
                     notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now,
             DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
index 45d042e..227df51 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
@@ -126,6 +126,10 @@ namespace APT.SK.WebApi.Controllers.Api
                         var serialCode = codes.Split(new char[] { ',' });
                         MFlowPermitService.InsertApprove(serialCode[0], "SK080", "", entity.ID, "SK080_SHOWPRINT", entity.TaskID, true, () =>
                         {
+                            if (userIds != null && userIds.Any())
+                                this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(userIds);
+                            if (fileIds != null && fileIds.Any())
+                                this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(fileIds);
                             if (entity != null)
                                 UpdateEntityNoCommit(entity);
                             if (userList != null && userList.Any())
@@ -176,6 +180,10 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 this.UnifiedCommit(() =>
                 {
+                    if (userIds != null && userIds.Any())
+                        this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(userIds);
+                    if (fileIds != null && fileIds.Any())
+                        this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(fileIds);
                     if (task != null)
                         UpdateEntityNoCommit(task);
                     if (entity != null)
@@ -204,7 +212,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 if (string.IsNullOrEmpty(id))
                     this.ThrowError("060010");
                 filter.IgnoreDataRule = true;
-                var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_RectifyRecord","Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"});
+                var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ChargeUser", "Nav_ApplyDepartment","Nav_RectifyRecord","Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"});
                 if (result != null && result.STATUS == PFStandardStatus.Rejected)
                 {
                     result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
index fe1c233..2b4dd95 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
@@ -161,7 +161,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 if (entity.CHECK_TYPE_ID == null)
                     throw new Exception("检查类型不能为空");
                 if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
-                    throw new Exception("检查时间必须填写");
+                    throw new Exception("检查时间必须填写");              
                 if (DateTime.Now.AddMinutes(30) > entity.CHECK_TIME)
                     throw new Exception("检查时间不得短于半小时,请修改检查时间");
                 T_FM_NOTIFICATION_TASK finishNotice = null;