From 3310b766bc8fb31201e9f40c2c35dcf086a35600 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 12 Nov 2022 19:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=91=E5=B8=83=E5=AE=8C=E6=B5=81=E7=A8=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A1=AE=E8=AE=A4=E6=8C=82=E8=B5=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=90=8D=E5=AD=97=E4=B8=BA=E2=80=98xxx=E2=80=99?=
 =?UTF-8?q?=E2=80=98=E7=9A=84=E6=95=B0=E6=8D=AE=E9=A1=B9=E2=80=9C=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=EF=BC=8C=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=EF=BC=8C=E4=BD=86=E6=98=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/pom.xml                         | 10 +++++-----
 yudao-ui-admin/src/views/bpm/model/index.vue |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 852a9dff0..262a6b7fd 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -68,11 +68,11 @@
 <!--            <version>${revision}</version>-->
 <!--        </dependency>-->
         <!-- 工作流 -->
-<!--        <dependency>-->
-<!--            <groupId>cn.iocoder.boot</groupId>-->
-<!--            <artifactId>yudao-module-bpm-biz</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-bpm-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue
index 4787306ff..fbb580fe3 100644
--- a/yudao-ui-admin/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin/src/views/bpm/model/index.vue
@@ -489,7 +489,10 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess(statusState + "成功");
-      }).catch(() => {});
+      }).catch(() => {
+        // 取消后，进行恢复按钮
+        row.processDefinition.suspensionState = (state === 1 ? 2 : 1);
+      });
     },
     /** 导入按钮操作 */
     handleImport() {