From 1b6b0b557d951fdb4512e9db05f27e46049d45d7 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 28 Jul 2022 09:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java  | 1 +
 .../biz/baseinternalpurchase/BaseInternalPurchaseService.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
index 249d442150..32601a9173 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
@@ -104,6 +104,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 	public ResultBean complete(BaseInterNalPurchaseCompleteDto bvd) {
 		BusinessVariables bv=new BusinessVariables();
 		BeanUtil.copyProperties(bvd,bv);
+		bv.setFormVariables(BeanUtil.beanToMap(bvd));
 		bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
 		return baseInternalPurchaseService.complete(bv);
 	}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index 302dd128d9..31060c87fd 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -541,6 +541,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             if (businessTaskId.equals(query.getTaskId())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
+                flowTaskVo.setValues(BeanUtil.beanToMap(baseInternalPurchase));
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());