From 11615685b72df336ea6b795a7160499014da4989 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sun, 24 Mar 2024 15:12:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=8A=84=E9=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActProcessDefinitionServiceImpl.java | 3 +++ .../org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 28c352033..52390f5b6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -179,6 +179,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer * @param processDefinitionId 流程定义id */ @Override + @Transactional(rollbackFor = Exception.class) public boolean deleteDeployment(String deploymentId, String processDefinitionId) { try { List taskInstanceList = QueryUtils.hisTaskInstanceQuery() @@ -188,6 +189,8 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer } //删除流程定义 repositoryService.deleteDeployment(deploymentId); + //删除表单配置 + iWfFormDefinitionService.getByDefId(processDefinitionId); return true; } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 55ff2795d..a980d7297 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -389,6 +389,10 @@ public class ActTaskServiceImpl implements IActTaskService { for (TaskVo task : taskList) { task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); } + if (CollUtil.isNotEmpty(taskList)) { + List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); + WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID); + } return new TableDataInfo<>(taskList, page.getTotal()); }