From fe8059c419f5e35889121544191d8db00be62207 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Thu, 2 Mar 2023 21:17:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AA=E5=B1=95=E7=A4=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=8A=82=E7=82=B9=E5=8A=9E=E7=90=86=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 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 bb3fd257..7debaee6 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
@@ -549,23 +549,27 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (CollectionUtils.isNotEmpty(taskList)) {
                 flowTask.setTaskId(taskList.get(0).getId());
                 flowTask.setTaskName(taskList.get(0).getName());
-                // 当前任务节点办理人信息
-                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(taskList.get(0).getAssignee()));
-                if (Objects.nonNull(sysUser)) {
-                    flowTask.setAssigneeId(sysUser.getUserId());
-                    flowTask.setAssigneeName(sysUser.getNickName());
-                    flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                if (StringUtils.isNotBlank(taskList.get(0).getAssignee())) {
+                    // 当前任务节点办理人信息
+                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(taskList.get(0).getAssignee()));
+                    if (Objects.nonNull(sysUser)) {
+                        flowTask.setAssigneeId(sysUser.getUserId());
+                        flowTask.setAssigneeName(sysUser.getNickName());
+                        flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                    }
                 }
             } else {
                 List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
                 flowTask.setTaskId(historicTaskInstance.get(0).getId());
                 flowTask.setTaskName(historicTaskInstance.get(0).getName());
-                // 当前任务节点办理人信息
-                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee()));
-                if (Objects.nonNull(sysUser)) {
-                    flowTask.setAssigneeId(sysUser.getUserId());
-                    flowTask.setAssigneeName(sysUser.getNickName());
-                    flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                if (StringUtils.isNotBlank(historicTaskInstance.get(0).getAssignee())) {
+                    // 当前任务节点办理人信息
+                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee()));
+                    if (Objects.nonNull(sysUser)) {
+                        flowTask.setAssigneeId(sysUser.getUserId());
+                        flowTask.setAssigneeName(sysUser.getNickName());
+                        flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                    }
                 }
             }
             flowList.add(flowTask);