diff --git a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java index 1cd07a5..5126128 100644 --- a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java +++ b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java @@ -192,9 +192,12 @@ } if (!list.isEmpty()){ //未办卡的排前面,按预约时间正序排列 + // 在排序逻辑中添加null安全处理 list = list.stream() - .sorted(Comparator.comparing(DispatchUserVO::getIsApplication) - .thenComparing(DispatchUserVO::getReservationTime)) + .sorted(Comparator.comparing(DispatchUserVO::getIsApplication, + Comparator.nullsLast(Boolean::compareTo)) + .thenComparing(DispatchUserVO::getReservationTime, + Comparator.nullsLast(String::compareTo))) .collect(Collectors.toList()); } return list;