diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java index 3f9abf4..3e1766b 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java @@ -141,11 +141,18 @@ public class TrainingScoreController { List sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample); if (!sysTrainingScores.isEmpty()) { SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0); - return sysTrainingScore.getReportContent(); + String reportSaveContent = sysTrainingScore.getReportSaveContent(); + String reportContent = sysTrainingScore.getReportContent(); + + if (reportSaveContent != null && !reportSaveContent.isEmpty()) { + return reportSaveContent; + } else if (reportContent != null && !reportContent.isEmpty()) { + return reportContent; + } } + return null; } - // 老师端文件下载 @GetMapping("/downloadReport") public AjaxResult downloadReport(@RequestParam Long id, HttpServletResponse response) {