From d0451fdd55195901e65e5c4b3b64028a86f9e669 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期日, 22 三月 2020 22:10:54 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java b/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
index dcc857c..8f38093 100644
--- a/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
@@ -90,7 +90,7 @@
public List<String> getTodoTask() {
TUser onlineUser = getOnlineUser();
Set<String> result = new HashSet<>();
- //List<Task> list1 = taskService.createTaskQuery().active().list();
+ //List<Task> list1 = TimeTaskService.createTaskQuery().active().list();
List<Task> list = taskService.createTaskQuery().taskAssignee(onlineUser.getUserId()).active().list();
result.addAll(list.stream().map(task -> task.getProcessInstanceId()).collect(Collectors.toList()));
@@ -101,6 +101,9 @@
List<Group> groups = identityService.createGroupQuery().groupMember(onlineUser.getUserId()).list();
+ if (groups.size() == 0) {
+ return new ArrayList<>(result);
+ }
List<String> groupIds = groups.stream().map(Group::getId).collect(Collectors.toList());
toClaimList = taskService.createTaskQuery().taskCandidateGroupIn(groupIds).active().list();
@@ -119,6 +122,9 @@
//TODO 闇�淇敼
NextTaskUserInfo nextTaskUserInfo = new NextTaskUserInfo();
Task nextTask = geTask(workflowId);
+ if (nextTask == null) {
+ return null;
+ }
String nextTaskAssignee = nextTask.getAssignee();
if (!StringUtils.isEmpty(nextTaskAssignee)) {
nextTaskUserInfo.setUserId(nextTaskAssignee);
--
Gitblit v1.8.0