diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 6999f6a..9b1620f 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -15056,9 +15056,10 @@ namespace APT.BaseData.Services.DomainServices } else { - var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Details"); + var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); entity.STATUS = PFStandardStatus.Archived; entity.END_DATE = DateTime.Now; + var sumDetails= this.GetEntities(t=>t.RISK_EVALUATION_SUMMARY_ID == entity.ID,new BaseFilter(entity.ORG_ID)); //触发风险检查关联表 T_SK_DOUBLE_PREVENT_MECHANISM dou = null; T_FM_NOTIFICATION_TASK notice = null; @@ -15071,8 +15072,8 @@ namespace APT.BaseData.Services.DomainServices //List contentPosts = new List(); //List contentDepartPosts = new List(); //List contentHiddenss = new List(); - entity.Nav_Details = entity.Nav_Details.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); - if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any()) + var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); + if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any()) { //var sumDetailIds = entity.Nav_Details.Select(t => t.ID).ToList(); //var sumDetailPosts = this.GetEntities(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)); @@ -15097,7 +15098,7 @@ namespace APT.BaseData.Services.DomainServices dou.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; dou.ORG_ID = entity.ORG_ID; dou.RISK_EVALUATE_SUMMARY_ID = entity.ID; - foreach (var item in entity.Nav_Details) + foreach (var item in entityDetails) { T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL(); detail.ORG_ID = item.ORG_ID; @@ -15264,8 +15265,7 @@ namespace APT.BaseData.Services.DomainServices } notice = NotificationTaskService.InsertUserNoticeTaskModel("风险检查关联表", dou.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK026"); - } - entity.Nav_Details = null; + } UnifiedCommit(() => { if (modelApp != null)