|
@@ -555,9 +555,10 @@ public class SysImplementPlanManager {
|
|
|
Map<String, Object> map = BeanUtil.copyProperties(item, Map.class);
|
|
|
WmTaskType taskType = collect.get(item.getTaskTypeName());
|
|
|
map.put("orgTaskTypeId", Objects.nonNull(taskType) ? taskType.getId() : null);
|
|
|
+ map.put("baseId", Objects.nonNull(taskType) ? taskType.getBaseId() : null);
|
|
|
map.put("parent_id", Objects.nonNull(taskType) ? taskType.getParentId() : null);
|
|
|
return map;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ }).filter(m -> Objects.nonNull(m.get("parent_id"))).sorted(Comparator.comparing(m -> (String) m.get("parent_id"))).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
copied.setPlanItems(CollUtil.isNotEmpty(coll) ? coll : Collections.emptyList());
|