|
|
@@ -1494,9 +1494,13 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
voList.add(vo);
|
|
|
}
|
|
|
}
|
|
|
- voList.stream().filter(f -> CollectionUtil.isNotEmpty(f.getFileList())).forEach(f -> {
|
|
|
- f.setFileList(f.getFileList().stream().sorted(Comparator.comparing(TableFile::getSort)).collect(Collectors.toList()));
|
|
|
- });
|
|
|
+ voList.stream()
|
|
|
+ .filter(f -> CollectionUtil.isNotEmpty(f.getFileList()))
|
|
|
+ .forEach(f -> {
|
|
|
+ f.setFileList(f.getFileList().stream()
|
|
|
+ .sorted(Comparator.comparing(TableFile::getSort, Comparator.nullsLast(Integer::compareTo)))
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ });
|
|
|
return voList;
|
|
|
}
|
|
|
|