From d181c3d292f7b93ba74d08d4450a22c663c29af0 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Mon, 17 Feb 2025 10:15:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=8A=B6=E6=80=81=E5=88=99=E8=BF=94=E5=9B=9Efalse?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/ChangeRecordServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 75bfb1a3..8cdebbe7 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
@@ -241,7 +241,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         // 1 构建前置状态与日志
         List<VisaStatusEnum> preStatusList = this.buildPreStatus(request.getUpdateStatus());
         // 2 更新状态
-        this.updateVisaStatus(request.getVisaId(), preStatusList, request.getUpdateStatus());
+        if (!this.updateVisaStatus(request.getVisaId(), preStatusList, request.getUpdateStatus())) {
+            return false;
+        }
         // 3 新增日志
         this.addLogWhenChangeStatus(request, VisaLogParam.builder()
                 .personId(request.getPersonId())
@@ -274,6 +276,11 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 .set(ChangeRecord::getStatus, updateStatus)
                 .update();
         if (!update) {
+            //单据最新的状态是更新状态
+            VisaDetailByIdResponse response = this.detailById(visaId);
+            if (response.getStatus().equals(updateStatus)) {
+                return false;
+            }
             throw new ServiceException("更新状态失败");
         }
         return update;