diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 8fad049..6fd292e 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -5729,7 +5729,7 @@ namespace APT.BaseData.Services.DomainServices result = NoticeNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast, isApprovel); break; case "BS/BSRiskSubmit/DealEndNew": - result = DealEndNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast); + result = DealEndNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast, isApprovel); break; case "BS/BSRiskSubmitDelayApply/DealEndNew": result = DealEnd_BS_DelayApplyNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast); @@ -7724,11 +7724,11 @@ namespace APT.BaseData.Services.DomainServices /// /// /// - private bool DealEndNew(T_PF_APPROVE entityInt, T_PF_APPROVE modelApp, List listAppDetail, T_FM_NOTIFICATION_TASK taskFinish, List listTaskNext, bool isLast = false) + private bool DealEndNew(T_PF_APPROVE entityInt, T_PF_APPROVE modelApp, List listAppDetail, T_FM_NOTIFICATION_TASK taskFinish, List listTaskNext, bool isLast = false, bool isApprovel = true) { #region 审批公用 - if (modelApp == null) + if (modelApp == null && isApprovel) { string taskCodeCheck = String.Empty; bool result = GetApproject2(entityInt, ref modelApp, ref listAppDetail, ref taskFinish, ref taskCodeCheck, ref isLast, ref listTaskNext); @@ -7740,7 +7740,7 @@ namespace APT.BaseData.Services.DomainServices #endregion - if (!isLast) + if (!isLast && isApprovel) { this.UnifiedCommit(() => {