From 9d7cd87d1137263cb2224cd63d32cdb023bab224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Wed, 26 Feb 2025 14:50:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:(feature/REQ-3581)=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=94=A8=E5=8D=B0=E6=97=B6=EF=BC=8C=E6=8A=8A=E5=90=88?=
 =?UTF-8?q?=E5=90=8Cid=E8=A6=81=E6=B8=85=E7=A9=BA=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/service/impl/ChangeRecordServiceImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)

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 bb6b2196..6cd50998 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
@@ -1850,6 +1850,11 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
             result.setStampStatus(oldValue.nextStampStatus(req.getVisaStampAction()));
         }
 
+        // 取消用印默认把合同id清空掉，后续如果有多种case，可以默认就清空，使用流程编排重构进行扩展
+        if (Objects.equals(req.getVisaStampAction(), CANCEL)) {
+            result.setContractId("");
+        }
+
         return result;
     }
 

From b0daccc763133b2da6f989cdd662a6c1ecd14613 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 26 Feb 2025 14:52:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3581)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=AE=A1=E6=89=B9=E6=97=B6=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BC=A0=E5=85=A5=E5=8F=98=E6=B4=BD=E7=AD=BE=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=BB=20ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/ChangeRecordRelationServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
index 74847b38..ee011319 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
@@ -668,6 +668,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
 
         create.setStartFormVariables(visaHelper.buildStartFormVariables(createReq));
         create.setVariables(Maps.of(
+                IM_GROUP_BIZ_INFO_VISA_ID, visa.getId(),
                 WORKFLOW_VAR_STAMP_OU_ID, model.getOuId(),
                 WORKFLOW_VAR_STAMP_TYPE, model.getSealType().name(),
                 WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), "")