|
@@ -116,17 +116,19 @@ public class GdpuMqController {
|
|
|
for (StandardFlowWorkMsg s : todoTaskList) {
|
|
|
TodoInfoDTO todoInfoDTO = new TodoInfoDTO();
|
|
|
setTodoInfoDTO(todoInfoDTO, s, basicSchool.getCode());
|
|
|
- processInfoDTO.setUserId(todoInfoDTO.getUserId());
|
|
|
- processInfoDTO.setUserName(todoInfoDTO.getUserName());
|
|
|
- processInfoDTO.setUrl(todoInfoDTO.getUrl());
|
|
|
- processInfoDTO.setMobileUrl(todoInfoDTO.getMobileUrl());
|
|
|
+ if (Objects.nonNull(processInfoDTO)) {
|
|
|
+ processInfoDTO.setUserId(todoInfoDTO.getUserId());
|
|
|
+ processInfoDTO.setUserName(todoInfoDTO.getUserName());
|
|
|
+ processInfoDTO.setUrl(todoInfoDTO.getUrl());
|
|
|
+ processInfoDTO.setMobileUrl(todoInfoDTO.getMobileUrl());
|
|
|
+ }
|
|
|
todoInfo.add(todoInfoDTO);
|
|
|
}
|
|
|
data.put("todoInfo", todoInfo);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (orunId != null) {
|
|
|
+ if (orunId != null && Objects.nonNull(processInfoDTO)) {
|
|
|
processInfo.add(processInfoDTO);
|
|
|
}
|
|
|
data.put("processInfo", processInfo);
|