From d9448e7976d4085c70c59c0ca0cb62cf57575e47 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, 25 May 2026 18:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E8=87=AA=E5=B7=B1=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9D=A1=E5=B7=B2=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrucialLicenseJobController.cs            | 20 +++++++++++++++++++
 .../CrucialLicenseJobOutsourceController.cs   | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
index b6fc23b..dac3f98 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
@@ -1427,6 +1427,26 @@ namespace APT.FO.WebApi.Controllers
                     {
                         var sendUserIds = new List<Guid>();
                         //var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
+                        //如果第一个批的人刚好是自己，加一条已办的审批记录
+                        var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
+                        if (applyApprove != null && applyApprove.Any())
+                        {
+                            //本人默认审批，存入一条已办
+                            T_FM_NOTIFICATION_TASK curentTask = new T_FM_NOTIFICATION_TASK();
+                            curentTask.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
+                            curentTask.NOTICE_TITLE = approve.NAME + "-" + operationStep?.NAME + "审批";
+                            curentTask.SOURCE_DATA_ID = approve.ID;
+                            curentTask.ORG_ID = approve.ORG_ID;
+                            curentTask.ID = Guid.NewGuid();
+                            curentTask.TASK_STARTDT = DateTime.Now;
+                            curentTask.TASK_ENDDT = DateTime.Now.AddHours(24);
+                            curentTask.NOTICE_TYPE = (int)FMNoticeTypeEnum.消息;
+                            curentTask.NOTICE_STATUS = (int)FMNoticeStatusEnum.正常已办;
+                            curentTask.USER_ID = (Guid)applyUserId;
+                            curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
+                            curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
+                            notices.Add(curentTask);
+                        }
                         var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
                         if (detailTemps != null && detailTemps.Any())
                         {
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
index 29fd3f9..17fced3 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
@@ -371,6 +371,26 @@ namespace APT.FO.WebApi.Controllers
                     //所有节点均无审核人,直接归档
                     if (appdetails != null && appdetails.Any())//curentApprove == null
                     {
+                        // 如果第一个批的人刚好是自己，加一条已办的审批记录
+                        var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
+                        if (applyApprove != null && applyApprove.Any())
+                        {
+                            //本人默认审批，存入一条已办
+                            T_FM_NOTIFICATION_TASK curentTask = new T_FM_NOTIFICATION_TASK();
+                            curentTask.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
+                            curentTask.NOTICE_TITLE = approve.NAME + "-" + operationStep?.NAME + "审批";
+                            curentTask.SOURCE_DATA_ID = approve.ID;
+                            curentTask.ORG_ID = approve.ORG_ID;
+                            curentTask.ID = Guid.NewGuid();
+                            curentTask.TASK_STARTDT = DateTime.Now;
+                            curentTask.TASK_ENDDT = DateTime.Now.AddHours(24);
+                            curentTask.NOTICE_TYPE = (int)FMNoticeTypeEnum.消息;
+                            curentTask.NOTICE_STATUS = (int)FMNoticeStatusEnum.正常已办;
+                            curentTask.USER_ID = (Guid)applyUserId;
+                            curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
+                            curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
+                            notices.Add(curentTask);
+                        }
                         var sendUserIds = new List<Guid>();
                         var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
                         if (curentApprove != null)