From f530fca056ca6376bcfa3bc23c4d17f6765bd7a9 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Wed, 11 Jun 2025 14:58:47 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=B7=B2=E5=BF=BD=E7=95=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/BusinessAlertServiceImpl.java     | 1 -
 .../main/resources/mapper/business/BusinessAlertMapper.xml  | 6 +-----
 .../dromara/workflow/controller/FlwInstanceController.java  | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
index 9d8a07c..022f219 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
@@ -456,7 +456,6 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
             return TableDataInfo.build();
         }
 
-        wrapper.in("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus());
 
         Page<BusinessAlert> page = this.baseMapper.pageBusinessAlertCancel(pageQuery.build(), wrapper, ptPrefix);
 
diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index ee5c6f7..0d94fa5 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -51,12 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="pageBusinessAlertCancel" resultType="org.dromara.business.domain.BusinessAlert">
         select t.* from (
                           select
-                                       ba.*,
-                                       b.flow_status flowStatus,
-                                       b.business_id businessId,
-                                       b.id instanceId
+                                       ba.*
                           from ${tbPrefix.tableBusiness}.business_alert ba
-                                   inner join ${tbPrefix.tableWorkflow}.flow_instance b on ba.id = b.business_id
                       ) t
             ${ew.getCustomSqlSegment}
     </select>
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
index 20d0c0f..26f7ee4 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
@@ -95,6 +95,7 @@ public class FlwInstanceController extends BaseController {
      *
      * @param bo 参数
      */
+    @Log(title = "忽略流程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/cancelProcessApply")
     public R<Void> cancelProcessApply(@RequestBody FlowCancelBo bo) {