diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java index a1897a2..567ff94 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java @@ -133,6 +133,7 @@ public class FixedContact20260730Controller extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { fixedContact20260730Service.delMain(id); + terminateRelatedProcess(id); return Result.OK("删除成功!"); } @@ -141,7 +142,13 @@ public class FixedContact20260730Controller extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.fixedContact20260730Service.delBatchMain(Arrays.asList(ids.split(","))); + String[] idArr = ids.split(","); + this.fixedContact20260730Service.delBatchMain(Arrays.asList(idArr)); + for (String id : idArr) { + if (oConvertUtils.isNotEmpty(id)) { + terminateRelatedProcess(id); + } + } return Result.OK("批量删除成功!"); } @@ -274,6 +281,29 @@ public class FixedContact20260730Controller extends JeecgController queryWrapper = new LambdaQueryWrapper() + .eq(TaskTask::getBusinessId, businessId); + List taskTaskList = taskTaskServiceImpl.list(queryWrapper); + if (taskTaskList == null || taskTaskList.isEmpty()) { + return; + } for (TaskTask taskTask : taskTaskList) { if (taskTask.getProcessInstId() != null) { long count = runtimeService.createProcessInstanceQuery() @@ -281,7 +311,7 @@ public class FixedContact20260730Controller extends JeecgController 0) { runtimeService.deleteProcessInstance(taskTask.getProcessInstId(), - "删除定点联系单关联流程, businessId: " + id); + "删除定点联系单关联流程, businessId: " + businessId); log.info("【定点联系-删除关联流程】已中止运行中的流程实例: {}", taskTask.getProcessInstId()); } } @@ -294,6 +324,5 @@ public class FixedContact20260730Controller extends JeecgController