From 3c2c4ab54d0c8d48137a3a3d73f822ca3cb502d1 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Thu, 27 Feb 2025 10:42:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91=E6=80=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=88=96=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordServiceImpl.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
index 64fbb6a7..56047afb 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
@@ -601,6 +601,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
             /*编辑*/
             changeRecord = getById(req.getId());
             AssertUtil.notNull(changeRecord, "记录不存在");
+            if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
+                // 编辑态下校验单据状态
+                AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
+                                || (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
+                        "当前单据审批中，不允许操作");
+            }
 
             oldContext = new VisaAddLogContext();
             oldContext.setStatus(changeRecord.getStatus());
@@ -762,14 +768,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     @Transactional(rollbackFor = Exception.class)
     public Long approveCreateVisaChangeRecord(VisaChangeApproveCreateReq req) {
         /*校验*/
-        ChangeRecord changeRecord = this.getById(req.getId());
-        if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
-            // 编辑态下校验单据状态
-            AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
-                            || (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
-                    "当前单据审批中，不允许操作");
-        }
         validVisaChangeForm(req);
+        ChangeRecord changeRecord = this.getById(req.getId());
         ChangeRecord oldChangeRecord = BeanUtil.copyProperties(changeRecord, ChangeRecord.class);
         List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles = this.buildAttachUploadFile(req.getId());