From ed8202891f39e1614cd4a71b399b875e610a0a92 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期四, 21 三月 2024 21:48:44 +0800
Subject: [PATCH] update 调整请假申请返回值，我的发起查询
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index f4e8df2..1a3b8b7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -61,6 +61,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_DEFINITION_ID;
+
/**
* 娴佺▼瀹炰緥 鏈嶅姟灞傚疄鐜�
*
@@ -583,7 +585,7 @@
BusinessStatusEnum.checkCancelStatus(processInstance.getBusinessStatus());
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
for (Task task : taskList) {
- taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId()));
+ taskService.setAssignee(task.getId(), null);
taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "锛氭挙閿�鐢宠");
}
HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
@@ -622,7 +624,7 @@
public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery();
- query.startedBy(bo.getStartUserId());
+ query.startedBy(String.valueOf(LoginHelper.getUserId()));
if (StringUtils.isNotBlank(bo.getName())) {
query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
@@ -654,6 +656,10 @@
}
list.add(processInstanceVo);
}
+ if (CollUtil.isNotEmpty(list)) {
+ List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
+ WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
+ }
long count = query.count();
return new TableDataInfo<>(list, count);
}
--
Gitblit v1.9.3