diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 5bab0f4..1ebf06d 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -12300,7 +12300,9 @@ namespace APT.BaseData.Services.DomainServices T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null; T_FM_NOTIFICATION_TASK notice = null; var majorUserIds = new List(); - var majorFileIds = new List(); + var majorFileIds = new List(); + var approveIds = new List(); + var approveDetailIds = new List(); if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null) { //先查下销号表是否已经触发过 @@ -12322,6 +12324,8 @@ namespace APT.BaseData.Services.DomainServices major.MONITOR_OPINION = null; majorUserIds = this.GetEntities(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); majorFileIds = this.GetEntities(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + approveIds = this.GetEntities(t => t.DATA_ID != null && t.DATA_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + approveDetailIds = this.GetEntities(t => t.APPROVE_ID != null && approveIds.Contains(t.APPROVE_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); } else { @@ -12359,7 +12363,11 @@ namespace APT.BaseData.Services.DomainServices if (major != null) this.UpdateEntityNoCommit(major); if (notice != null) - this.UpdateEntityNoCommit(notice); + this.UpdateEntityNoCommit(notice); + if (approveDetailIds != null && approveDetailIds.Any()) + this.BantchDeleteEntityNoCommit(approveDetailIds); + if (approveIds != null && approveIds.Any()) + this.BantchDeleteEntityNoCommit(approveIds); }); } return true;