From 3a4406255aa667abd3d2725cdb87f9699819b056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Mon, 24 Jul 2023 14:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/controller/TrainingController.java  | 3 ++-
 .../sztzjy/forex/trading_trading/service/ReportService.java   | 2 +-
 .../sztzjy/forex/trading_trading/service/TrainingService.java | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java
index 13a6de5..4fdc52b 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java
@@ -111,7 +111,8 @@ public class TrainingController {
     public ResultEntity<PageInfo<Training>> findByConditions(@ApiParam("页码") Integer index,
                                                              @ApiParam("页量") Integer size) {
         //TODO 待确认需过滤参数
-        return new ResultEntity<PageInfo<Training>>(HttpStatus.OK, trainingService.pagedListTraining(index, size));
+        JwtUser currentUser = TokenProvider.getJWTUser(request);
+        return new ResultEntity<PageInfo<Training>>(HttpStatus.OK, trainingService.pagedListTraining(currentUser.getSchoolId(),index, size));
     }
 
     @Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH)
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
index e9d7d33..31bfe70 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
@@ -144,6 +144,6 @@ public class ReportService {
     public void download(String id, HttpServletResponse response){
         Report report = reportsMapper.selectByPrimaryKey(id);
         Assert.isTrue(report!=null&&report.getFilePath()!=null,"报告不存在");
-        fileUtil.download(response,report.getFilePath(),report.getFileName());
+        fileUtil.download(response,report.getFileName(),report.getFilePath());
     }
 }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java
index a569efc..8c43381 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java
@@ -95,9 +95,11 @@ public class TrainingService {
         return training.size() > 0;
     }
 
-    public PageInfo<Training> pagedListTraining(int pageNo, int pageSize) {
+    public PageInfo<Training> pagedListTraining(Integer schoolId,int pageNo, int pageSize) {
         //TODO 待确定过滤参数
         TrainingExample example = new TrainingExample();
+        TrainingExample.Criteria criteria = example.createCriteria();
+        criteria.andSchoolIdEqualTo(schoolId);
         PageHelper.startPage(pageNo, pageSize);
         return new PageInfo<>(trainingMapper.selectByExample(example));
     }