整改验收单 如果验收人是唯一一个 审批人 报错处理

This commit is contained in:
wyw 2024-08-14 09:46:25 +08:00
parent 5711e79fa3
commit c98bc63e14

View File

@ -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
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
private bool DealEndNew(T_PF_APPROVE entityInt, T_PF_APPROVE modelApp, List<T_PF_APPROVE_DETAIL> listAppDetail, T_FM_NOTIFICATION_TASK taskFinish, List<T_FM_NOTIFICATION_TASK> listTaskNext, bool isLast = false)
private bool DealEndNew(T_PF_APPROVE entityInt, T_PF_APPROVE modelApp, List<T_PF_APPROVE_DETAIL> listAppDetail, T_FM_NOTIFICATION_TASK taskFinish, List<T_FM_NOTIFICATION_TASK> 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(() =>
{