From c98bc63e1484c04f3f0f10372ea273578406fdb8 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 14 Aug 2024 09:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E9=AA=8C=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E9=AA=8C=E6=94=B6=E4=BA=BA=E6=98=AF?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E4=B8=80=E4=B8=AA=20=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BA=BA=20=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/PF/PFApproveCallBackService.cs               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
         /// </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(() =>
                 {