diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java index cb1aa80e..3d688703 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java @@ -123,18 +123,20 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl results = new ArrayList<>(); if (CollectionUtils.isNotEmpty(datas)) { for (BusProcessHistory data : datas) { - ResponseMessage assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId()); - String userName = ""; - if(assignee.getData()!=null){ - if (assignee.getData().getDisableFlag() == 1) { - userName = assignee.getData().getUname() + "("+ assignee.getData().getUsid() +")" + "(已禁用)"; + if (StringUtils.isNotEmpty(data.getUserId())) { + ResponseMessage assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId()); + String userName = ""; + if (assignee.getData() != null) { + if (assignee.getData().getDisableFlag() == 1) { + userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")" + "(已禁用)"; + } else { + userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")"; + } } else { - userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")"; + userName = data.getUserId(); } - } else { - userName = data.getUserId(); + data.setUserName(userName); } - data.setUserName(userName); data.setTaskStatusShow(TaskStatusEnum.getLabelByValue(data.getTaskStatus())); String taskKeyShow = ""; @@ -291,7 +293,7 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl StringUtils.isNotEmpty(bph.getUserName())).map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(",")); taskStatus = TaskStatusEnum.DONE.getValue(); for (BusProcessHistory busProcessHistory : bphListByTaskKey) { if (StringUtils.isEmpty(busProcessHistory.getTaskId())