Browse Source

[feat]修复查询已忽略bug

dev
杨威 1 week ago
parent
commit
f530fca056
  1. 1
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
  2. 6
      dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
  3. 1
      dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java

1
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(); return TableDataInfo.build();
} }
wrapper.in("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus());
Page<BusinessAlert> page = this.baseMapper.pageBusinessAlertCancel(pageQuery.build(), wrapper, ptPrefix); Page<BusinessAlert> page = this.baseMapper.pageBusinessAlertCancel(pageQuery.build(), wrapper, ptPrefix);

6
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 id="pageBusinessAlertCancel" resultType="org.dromara.business.domain.BusinessAlert">
select t.* from ( select t.* from (
select select
ba.*, ba.*
b.flow_status flowStatus,
b.business_id businessId,
b.id instanceId
from ${tbPrefix.tableBusiness}.business_alert ba from ${tbPrefix.tableBusiness}.business_alert ba
inner join ${tbPrefix.tableWorkflow}.flow_instance b on ba.id = b.business_id
) t ) t
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>

1
dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java

@ -95,6 +95,7 @@ public class FlwInstanceController extends BaseController {
* *
* @param bo 参数 * @param bo 参数
*/ */
@Log(title = "忽略流程", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping("/cancelProcessApply") @PutMapping("/cancelProcessApply")
public R<Void> cancelProcessApply(@RequestBody FlowCancelBo bo) { public R<Void> cancelProcessApply(@RequestBody FlowCancelBo bo) {

Loading…
Cancel
Save