From 4d88f8913bd8464f2d0c8f4994d24bfc9e38bfaa Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 2 Nov 2026 14:28:05 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E9=A1=B9=E7=9B=AE=E5=86=8D=E6=8F=90=E4=BA=A4=E8=A2=AB?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=A1=E9=AA=8C=E6=8B=A6=E4=BD=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../service/impl/ProjectApplyServiceImpl.java        | 12 +++++++++++-
 .../service/impl/ProjectChangeServiceImpl.java       | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java
index d1ff04d0..21616552 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java
@@ -195,7 +195,17 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submitApproval(Long id) {
-		ProjectApply projectApply = loadEditable(id, true);
+		ProjectApply projectApply = loadExists(id);
+		if (!canCurrentUserOperate(projectApply)) {
+			throw new ServiceException("无权操作其他组织项目立项");
+		}
+		// 已在审批中则幂等成功，避免「先 MK 后本地」时 sync 已写成 reviewing 再被编辑校验拦住
+		if (List.of(STATUS_REVIEWING, STATUS_CHANGE_REVIEWING).contains(projectApply.getApprovalStatus())) {
+			return true;
+		}
+		if (!List.of(STATUS_DRAFT, STATUS_WITHDRAWN, STATUS_REJECTED, "change_rejected").contains(projectApply.getApprovalStatus())) {
+			throw new ServiceException("当前状态不允许提交");
+		}
 		validateSubmit(projectApply);
 		projectApply.setApprovalStatus(STATUS_REVIEWING);
 		projectApply.setCurrentNode(resolveApprovalNode(projectApply));
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java
index ebc224f6..d61edbc5 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java
@@ -170,7 +170,17 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submitApproval(Long id) {
-		ProjectChange projectChange = loadEditable(id);
+		ProjectChange projectChange = loadExists(id);
+		if (!canCurrentUserOperate(projectChange)) {
+			throw new ServiceException("无权操作其他组织项目变更");
+		}
+		// 已在审批中则幂等成功，避免 MK 回写 reviewing 后再提交被编辑校验拦住
+		if (Objects.equals(projectChange.getApprovalStatus(), STATUS_REVIEWING)) {
+			return true;
+		}
+		if (!List.of(STATUS_DRAFT, STATUS_WITHDRAWN, STATUS_REJECTED).contains(projectChange.getApprovalStatus())) {
+			throw new ServiceException("当前状态不允许提交");
+		}
 		validateSubmit(projectChange);
 		projectChange.setApprovalStatus(STATUS_REVIEWING);
 		projectChange.setCurrentNode(resolveApprovalNode(projectChange));