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<HistoricTaskInstance> 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<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
+            WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+        }
         return new TableDataInfo<>(taskList, page.getTotal());
     }