From 7cf9c1598401dc7b54d8d1ccedccc17ec3f33f3e Mon Sep 17 00:00:00 2001
From: ibaiyy <zranfly@qq.com>
Date: 星期四, 23 五月 2024 21:49:24 +0800
Subject: [PATCH] 流程办理时校验是否是任务办理人【提交、委托、转办、终止、退回】
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
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 1a4866d..6a6b1b1 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
@@ -159,15 +159,8 @@
@Transactional(rollbackFor = Exception.class)
public boolean completeTask(CompleteTaskBo completeTaskBo) {
try {
- List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
String userId = String.valueOf(LoginHelper.getUserId());
- TaskQuery taskQuery = QueryUtils.taskQuery();
- taskQuery.taskId(completeTaskBo.getTaskId()).taskCandidateOrAssigned(userId);
- if (CollUtil.isNotEmpty(roles)) {
- List<String> groupIds = StreamUtils.toList(roles, e -> String.valueOf(e.getRoleId()));
- taskQuery.taskCandidateGroupIn(groupIds);
- }
- Task task = taskQuery.singleResult();
+ Task task = WorkflowUtils.getTaskByCurrUser(completeTaskBo.getTaskId());
if (task == null) {
throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
}
@@ -470,8 +463,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delegateTask(DelegateBo delegateBo) {
- TaskQuery query = QueryUtils.taskQuery();
- TaskEntity task = (TaskEntity) query.taskId(delegateBo.getTaskId()).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())).singleResult();
+ Task task = WorkflowUtils.getTaskByCurrUser(delegateBo.getTaskId());
+
if (ObjectUtil.isEmpty(task)) {
throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
}
@@ -544,7 +537,7 @@
*/
@Override
public boolean transferTask(TransmitBo transmitBo) {
- Task task = QueryUtils.taskQuery().taskId(transmitBo.getTaskId()).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())).singleResult();
+ Task task = WorkflowUtils.getTaskByCurrUser(transmitBo.getTaskId());
if (ObjectUtil.isEmpty(task)) {
throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
}
@@ -669,9 +662,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String backProcess(BackProcessBo backProcessBo) {
- TaskQuery query = QueryUtils.taskQuery();
String userId = String.valueOf(LoginHelper.getUserId());
- Task task = query.taskId(backProcessBo.getTaskId()).taskCandidateOrAssigned(userId).singleResult();
+ Task task = WorkflowUtils.getTaskByCurrUser(backProcessBo.getTaskId());
+
if (ObjectUtil.isEmpty(task)) {
throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
}
--
Gitblit v1.9.3