|
@@ -534,8 +534,8 @@ public class SysImplementPlanManager {
|
|
coll = detailsItems.stream().map(item -> {
|
|
coll = detailsItems.stream().map(item -> {
|
|
Map<String, Object> map = BeanUtil.copyProperties(item, Map.class);
|
|
Map<String, Object> map = BeanUtil.copyProperties(item, Map.class);
|
|
WmTaskType taskType = collect.get(item.getTaskTypeName());
|
|
WmTaskType taskType = collect.get(item.getTaskTypeName());
|
|
- map.put("orgTaskTypeId", taskType.getId());
|
|
|
|
- map.put("parent_id", taskType.getParentId());
|
|
|
|
|
|
+ map.put("orgTaskTypeId", Objects.nonNull(taskType) ? taskType.getId() : null);
|
|
|
|
+ map.put("parent_id", Objects.nonNull(taskType) ? taskType.getParentId() : null);
|
|
return map;
|
|
return map;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
}
|
|
}
|