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

npe

This commit is contained in:
wangliwen 2022-04-21 20:05:54 +08:00
parent 80648e1f59
commit 36220f9e70
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
View File

@ -15,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -29,6 +28,7 @@ import java.util.Map;
/** /**
* 流程的历史信息 * 流程的历史信息
*
* @author Jone * @author Jone
*/ */
@RestController @RestController
@ -107,11 +107,11 @@ public class HistoryController {
for (ProcessActivityDTO activityDTO : page.getList()) { for (ProcessActivityDTO activityDTO : page.getList()) {
if (StringUtils.isNotEmpty(activityDTO.getStartUserId())) { if (StringUtils.isNotEmpty(activityDTO.getStartUserId())) {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getStartUserId())); SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getStartUserId()));
activityDTO.setStartUserName(userDTO.getRealName()); activityDTO.setStartUserName(userDTO != null ? userDTO.getRealName() : "");
} }
if (StringUtils.isNotEmpty(activityDTO.getAssignee())) { if (StringUtils.isNotEmpty(activityDTO.getAssignee())) {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee())); SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));
activityDTO.setAssigneeName(userDTO.getRealName()); activityDTO.setAssigneeName(userDTO != null ? userDTO.getRealName() : "");
} }
} }
return new Result().ok(page); return new Result().ok(page);