BJ_FS / urbanops

Commit 66bba7b9ec231e204052fb7f5d3dc018057708bc

Authored by 颜惠青
2 parents 140244ce 0daa83ad

Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java
  View file @66bba7b
@@ -27,9 +27,11 @@ public interface AssignTaskConvert { @@ -27,9 +27,11 @@ public interface AssignTaskConvert {
27 List<AssignTasksInfoRespVO> taskVOList = CollectionUtils.convertList(pageResult.getList(), task -> { 27 List<AssignTasksInfoRespVO> taskVOList = CollectionUtils.convertList(pageResult.getList(), task -> {
28 AssignTasksInfoRespVO taskVO = BeanUtils.toBean(task, AssignTasksInfoRespVO.class); 28 AssignTasksInfoRespVO taskVO = BeanUtils.toBean(task, AssignTasksInfoRespVO.class);
29 AssignTasksDO tasksDO = taskMap.get(taskVO.getTaskId()); 29 AssignTasksDO tasksDO = taskMap.get(taskVO.getTaskId());
30 - taskVO.setTaskName(tasksDO.getTaskName());  
31 - taskVO.setTaskType(tasksDO.getTaskType());  
32 - taskVO.setDeadline(tasksDO.getDeadline()); 30 + if (tasksDO != null) {
  31 + taskVO.setTaskName(tasksDO.getTaskName());
  32 + taskVO.setTaskType(tasksDO.getTaskType());
  33 + taskVO.setDeadline(tasksDO.getDeadline());
  34 + }
33 return taskVO; 35 return taskVO;
34 }); 36 });
35 return new PageResult<>(taskVOList, pageResult.getTotal()); 37 return new PageResult<>(taskVOList, pageResult.getTotal());