wyw/mh_lcmk_sms_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wyw 2024-08-14 09:46:25 +08:00
parent 5711e79fa3
commit c98bc63e14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -5729,7 +5729,7 @@ namespace APT.BaseData.Services.DomainServices
result = NoticeNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast, isApprovel); result = NoticeNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast, isApprovel);
break; break;
case "BS/BSRiskSubmit/DealEndNew": case "BS/BSRiskSubmit/DealEndNew":
result = DealEndNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast); result = DealEndNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast, isApprovel);
break; break;
case "BS/BSRiskSubmitDelayApply/DealEndNew": case "BS/BSRiskSubmitDelayApply/DealEndNew":
result = DealEnd_BS_DelayApplyNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast); result = DealEnd_BS_DelayApplyNew(entityInt, modelApp, listAppDetail, taskFinish, listTaskNext, isLast);
@ -7724,11 +7724,11 @@ namespace APT.BaseData.Services.DomainServices
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <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 审批公用 #region 审批公用
if (modelApp == null) if (modelApp == null && isApprovel)
{ {
string taskCodeCheck = String.Empty; string taskCodeCheck = String.Empty;
bool result = GetApproject2(entityInt, ref modelApp, ref listAppDetail, ref taskFinish, ref taskCodeCheck, ref isLast, ref listTaskNext); 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 #endregion
if (!isLast) if (!isLast && isApprovel)
{ {
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {