From 0b191bed060daab54b17859788c8c8e730782eaa Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 9 Mar 2026 15:53:42 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/thirdparty/ChargeAlgorithmController.java | 3 --- .../service/impl/ChargeAlgorithmRecordServiceImpl.java | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java index 23f670682..7099bcf65 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java @@ -21,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/chargealgorithm") public class ChargeAlgorithmController extends BaseController { - @Autowired - private ChargeAlgorithmService chargeAlgorithmService; - @Autowired private BatteryChargeReportService batteryChargeReportService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java index b7e7d0323..559274d72 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java @@ -129,10 +129,14 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe String reportType = dto.getReportType(); if (StringUtils.equals(Constants.ONE, reportType)) { // 1-web 端 - return record.getWebUrl(); + if (StringUtils.isNotBlank(record.getWebUrl())) { + return record.getWebUrl(); + } }else if (StringUtils.equals(Constants.TWO, reportType)) { // 2-pdf 端 - return record.getPdfUrl(); + if (StringUtils.isNotBlank(record.getPdfUrl())) { + return record.getPdfUrl(); + } } return ""; }