From 0e131fbcb60ceb695996bbd80831b8dda10ca5ac Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 20 Mar 2026 15:07:57 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-19=20=E4=BC=98=E5=8C=96=E3=80=90?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=B3=E9=97=AD=E3=80=91=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/mapper/ChangeManagementMapper.java    |  6 ++++++
 .../impl/ChangeManagementServiceImpl.java        | 12 ++++++++++++
 .../mapper/change/ChangeManagementMapper.xml     | 16 ++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index 3dd6d9fc..0f73d85c 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -234,4 +234,10 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     Integer countDocumentByStatus(@Param("tableName") String tableName, @Param("keyField") String keyField,
                                   @Param("statusField") String statusField, @Param("approvedStatus") String approvedStatus,
                                   @Param("site") String site, @Param("docNo") String docNo);
+
+    Integer countDocumentByStepId(@Param("tableName") String tableName, @Param("keyField") String keyField,
+                                  @Param("site") String site, @Param("docNo") String docNo);
+
+    Integer countApproverMatch(@Param("site") String site, @Param("docNo") String docNo,
+                               @Param("userName") String userName);
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index e188744f..0b3f6137 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -2507,6 +2507,18 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 throw new RuntimeException("单据 [" + docNo + "] 状态不是审批中，无法关闭流程！");
             }
 
+            // 校验单据stepId必须是10
+            Integer stepCount = changeManagementMapper.countDocumentByStepId(tableName, keyField, vo.getSite(), docNo);
+            if (stepCount == null || stepCount == 0) {
+                throw new RuntimeException("单据 [" + docNo + "] 当前步骤不是第一审批节点，无法关闭流程！");
+            }
+
+            // 校验当前节点审批人包含当前登录人
+            Integer approverCount = changeManagementMapper.countApproverMatch(vo.getSite(), docNo, vo.getUserName());
+            if (approverCount == null || approverCount == 0) {
+                throw new RuntimeException("单据 [" + docNo + "] 当前节点审批人不包含当前登录用户，无法关闭流程！");
+            }
+
             // 获取流程信息（workflowId + requestId + OA用户ID）
             List<ProcessFormCloseVo> processFormList = changeManagementMapper.getProcessFormInfoForClose(vo.getSite(), docNo);
 
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 7d6631b8..d67724aa 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -1726,4 +1726,20 @@
         FROM ${tableName}
         WHERE site = #{site} AND ${keyField} = #{docNo} AND ${statusField} = #{approvedStatus}
     </select>
+
+    <select id="countDocumentByStepId" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM ${tableName}
+        WHERE site = #{site} AND ${keyField} = #{docNo} AND step_id = 10
+    </select>
+
+    <select id="countApproverMatch" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM plm_process_form a
+        LEFT JOIN sys_user b ON a.domain_control_account = b.domain_control_account
+        WHERE a.site = #{site}
+          AND a.document_no = #{docNo}
+          AND a.is_remark = '0'
+          AND ISNULL(a.update_by, b.username) = #{userName}
+    </select>
 </mapper>