wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-08 17:21:14 +08:00
parent 1df08939cb 510afd01cc
commit 30e60deda8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -344,7 +344,9 @@ public class ActHistoryService {
this.convertTaskInfo(task, taskDTO);
if (StringUtils.isNotEmpty(taskDTO.getAssignee())) {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(taskDTO.getAssignee()));
taskDTO.setAssigneeName(userDTO.getRealName());
if (userDTO != null) {
taskDTO.setAssigneeName(userDTO.getRealName());
}
}
taskDTOList.add(taskDTO);
dto.setBackToFirst(taskDTO.getBackToFirst());