kimi
2020-03-31 74472c9d22dddcb41383794caf0011043b20f817
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);