From 5ac3e333c2112a177d692fc8ef6ace475b6f0d69 Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Thu, 27 Oct 2022 14:56:55 +0800
Subject: [PATCH] npe

---
 .../renren/modules/activiti/controller/HistoryController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
index df5076df..b806fcb7 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
@@ -200,7 +200,7 @@ public class HistoryController {
             if (StringUtils.isNotEmpty(activityDTO.getStartUserId())) {
                 SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getStartUserId()));
                 activityDTO.setStartUserName(userDTO != null ? userDTO.getRealName() : "");
-                activityDTO.setStartUserDeptName(sysUserDao.getDeptNameByUserId(userDTO.getId().toString()));
+                activityDTO.setStartUserDeptName(userDTO != null ? sysUserDao.getDeptNameByUserId(userDTO.getId().toString()) : "");
             }
             if (StringUtils.isNotEmpty(activityDTO.getAssignee())) {
                 SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));