diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java index 516169d..c0d4ed8 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java @@ -27,9 +27,11 @@ public interface AssignTaskConvert { List taskVOList = CollectionUtils.convertList(pageResult.getList(), task -> { AssignTasksInfoRespVO taskVO = BeanUtils.toBean(task, AssignTasksInfoRespVO.class); AssignTasksDO tasksDO = taskMap.get(taskVO.getTaskId()); - taskVO.setTaskName(tasksDO.getTaskName()); - taskVO.setTaskType(tasksDO.getTaskType()); - taskVO.setDeadline(tasksDO.getDeadline()); + if (tasksDO != null) { + taskVO.setTaskName(tasksDO.getTaskName()); + taskVO.setTaskType(tasksDO.getTaskType()); + taskVO.setDeadline(tasksDO.getDeadline()); + } return taskVO; }); return new PageResult<>(taskVOList, pageResult.getTotal());