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 ""; }