From 8cc95aec1bd69c9e62685a81e0b53b36fbf284cd Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Mon, 6 Feb 2023 14:32:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=9C=AA=E5=88=86=E9=85=8D=E9=83=A8=E9=97=A8=E6=97=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=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  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 65cf21d8..2ee3ef75 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
@@ -815,7 +815,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //                    flowTask.setFinishTime(histIns.getEndTime());
 //                    hisFlowList.add(flowTask);
 //                } else
-                    if (StringUtils.isNotBlank(histIns.getTaskId())) {
+                if (StringUtils.isNotBlank(histIns.getTaskId())) {
                     FlowTaskDto flowTask = new FlowTaskDto();
                     flowTask.setTaskId(histIns.getTaskId());
                     flowTask.setTaskName(histIns.getActivityName());
@@ -825,7 +825,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                         SysUser sysUser = sysUserService.selectUserById(Long.parseLong(histIns.getAssignee()));
                         flowTask.setAssigneeId(sysUser.getUserId());
                         flowTask.setAssigneeName(sysUser.getNickName());
-                        flowTask.setDeptName(sysUser.getDept().getDeptName());
+                        flowTask.setDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
                     }
                     // 展示审批人员
                     List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());