From 960f35663127f38584b35b391e86ea647ed18aa0 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Tue, 7 Sep 2021 15:10:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     | 43 ++++---------------
 1 file changed, 8 insertions(+), 35 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 3af8712..7a3ccd1 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
@@ -442,41 +442,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setProcDefVersion(pd.getVersion());
             flowTask.setCategory(pd.getCategory());
             flowTask.setProcDefVersion(pd.getVersion());
-
-            // 当前所处流程
-//            Task task = taskService.createTaskQuery().processInstanceId(hisIns.getId()).singleResult();
-            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
-            if (CollectionUtils.isNotEmpty(taskList)) {
-//                flowTask.setTaskName(task.getName());
-                flowTask.setTaskId(taskList.get(0).getId());
-//                // 指定审批人员信息
-//                if (StringUtils.isNotBlank(task.getAssignee())) {
-//                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(task.getAssignee()));
-//                    flowTask.setAssigneeId(sysUser.getUserId());
-//                    flowTask.setAssigneeName(sysUser.getNickName());
-//                    flowTask.setDeptName(sysUser.getDept().getDeptName());
-//                } else {
-//                    // 候选审批人员信息
-//                    List<IdentityLink> linksForTask = taskService.getIdentityLinksForTask(task.getId());
-//                    StringBuilder stringBuilder = new StringBuilder();
-//                    for (IdentityLink identityLink : linksForTask) {
-//                        if ("candidate".equals(identityLink.getType())) {
-//                            if (StringUtils.isNotBlank(identityLink.getUserId())) {
-//                                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
-//                                stringBuilder.append(sysUser.getNickName()).append(",");
-//                            }
-//                            if (StringUtils.isNotBlank(identityLink.getGroupId())) {
-//                                SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
-//                                stringBuilder.append(sysRole.getRoleName()).append(",");
-//                            }
-//                        }
-//                    }
-//                    flowTask.setCandidate(stringBuilder.substring(0, stringBuilder.length() - 1));
-//                }
-            } else {
-                List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
-                flowTask.setTaskId(historicTaskInstance.get(0).getId());
-            }
+            // 当前所处流程 todo: 本地启动放开以下注释
+//            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
+//            if (CollectionUtils.isNotEmpty(taskList)) {
+//                flowTask.setTaskId(taskList.get(0).getId());
+//            } else {
+//                List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
+//                flowTask.setTaskId(historicTaskInstance.get(0).getId());
+//            }
             flowList.add(flowTask);
         }
         page.setRecords(flowList);