From 9979beb27154d8d45034bf10282cebd27a1817a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 17:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=BE=85=E5=8A=9E=E6=9C=AA?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E7=9A=84=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=89=B9?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=9B=B4=E6=8E=A5=E6=B6=88=E6=8E=89?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ApproveController.cs      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
index 870c20a..916fa39 100644
--- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
+++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
@@ -95,13 +95,27 @@
                 var dbApprove = this.GetEntity<T_PF_APPROVE>(entity.ID.ToString(), false, "Nav_ApproveDetails");
                 if (dbApprove == null)
                     this.ThrowError("020027");
-                if (dbApprove.APPROVE_STATUS != (int)ApproveStatus.Doing)
-                    this.ThrowError("020028");
                 var node = dbApprove.Nav_ApproveDetails.FirstOrDefault(i => i.ID == entity.CurrentNode.ID);
                 if (!node.IS_CURRENT)
                     this.ThrowError("020030");
+                T_FM_NOTIFICATION_TASK task = null;
+                if (dbApprove.APPROVE_STATUS != (int)ApproveStatus.Doing)
+                {
+                    //this.ThrowError("020028");
+                    //原来是报错，现在直接把待办消掉
+                    task = this.GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID
+                    && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false);
+                    if (task != null)
+                    {
+                        task.NOTICE_STATUS = FMNoticeStatusEnum.正常已办.GetInt();
+                        task.TASK_DT = DateTime.Now;
+                        this.UpdateEntityNoCommit(task);
+                    }
+                    return "";
+                }
+                
                 //查询消息表
-                var task = this.GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID
+                task = this.GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID
                 && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false);
                 if (task != null)
                 {