diff --git a/src/main/java/com/chint/application/queryies/OrderQuery.java b/src/main/java/com/chint/application/queryies/OrderQuery.java index 0867599e..71b3efb7 100644 --- a/src/main/java/com/chint/application/queryies/OrderQuery.java +++ b/src/main/java/com/chint/application/queryies/OrderQuery.java @@ -284,7 +284,10 @@ public class OrderQuery { .filter(Objects::nonNull) .toList(); locationRes.addAll(carLocationList); - res.setLocationResList(locationRes); + res.setLocationResList(locationRes.stream() + .distinct() + .filter(Objects::nonNull) + .toList()); res.setUserName(user.getName()); if (LocalDateTime.now().isAfter(routeOrder.getEndTime())) {