From 5dce8b6182f106cb4255f678c78993de0a03a50e Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Mon, 26 Dec 2022 09:22:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=89=80=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=83=BD=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index 022c1b4c..d85ad1b6 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -64,6 +64,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * @author XuanXuan
@@ -628,9 +629,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         TaskQuery taskQuery = taskService.createTaskQuery()
                 .active()
                 .includeProcessVariables()
-                .taskAssignee(userId.toString())
-//                .taskCandidateUser(userId.toString())
-//                .taskCandidateGroup(sysUser.getRoleId().toString())
+                .taskCandidateOrAssigned(userId.toString())
                 .orderByTaskCreateTime().desc();
         page.setTotal(taskQuery.count());
         List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);