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 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" 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 cancelProcessApply(@RequestBody FlowCancelBo bo) {