Explorar el Código

附件查询sort为null空指针

cr hace 1 semana
padre
commit
9345f60b23

+ 7 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -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;
     }