diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeFaultreportReviewController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeFaultreportReviewController.java index 0d407307..0218859a 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeFaultreportReviewController.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeFaultreportReviewController.java @@ -29,8 +29,6 @@ public class EbikeFaultreportReviewController { @Autowired private EbikeFaultreportReviewService ebikeFaultreportReviewService; - @Resource - private OrdersFeignClient ebikeUserFaultreportService; /** * 添加用户上报故障审查。 diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeFaultreportReviewServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeFaultreportReviewServiceImpl.java index 09e3ba95..5486a7cc 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeFaultreportReviewServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeFaultreportReviewServiceImpl.java @@ -91,7 +91,7 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl last = ebikeFaultreportReview.getFaultReports().stream().max( + Optional last = ebikeFaultreportReview.getFaultReports().stream().filter(obj->obj.getReportAt()!=null).max( Comparator.comparing( ResEbikeUserFaultreportDto::getReportAt, Comparator.nullsLast(Comparator.naturalOrder())