From 1ab5f20bb92e83dc21e7fc855efc36be133676bc Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Fri, 18 Apr 2025 17:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E2=86=92=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=94=A8=E6=88=B7=E4=B8=8A=E6=8A=A5=E7=9A=84?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BD=9C=E4=B8=BA=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeFaultreportReviewController.java            | 2 --
 .../service/impl/EbikeFaultreportReviewServiceImpl.java         | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

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<EbikeFaultrep
             // 如果审查属实，直接上报
             if ("1".equals(entity.getResult())){
                 // 使用最后一次上报的故障信息上报的经纬度
-                Optional<ResEbikeUserFaultreportDto> last = ebikeFaultreportReview.getFaultReports().stream().max(
+                Optional<ResEbikeUserFaultreportDto> last = ebikeFaultreportReview.getFaultReports().stream().filter(obj->obj.getReportAt()!=null).max(
                         Comparator.comparing(
                                 ResEbikeUserFaultreportDto::getReportAt,
                                 Comparator.nullsLast(Comparator.naturalOrder())