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 665aeb8..2633f75 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
@@ -269,8 +269,11 @@ public class TrainingController {
     @Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH)
     @ApiOperation("根据班级id获取实训列表")
     @GetMapping("/findTrainingListByClassId")
-    public ResultEntity<List<Map<String,Object>>> findTrainingListByClassId(@ApiParam("实训记录id") @RequestParam String classId) {
-        Assert.hasText(classId,"班级id不能为空");
-        return new ResultEntity<List<Map<String,Object>>>(HttpStatus.OK, memberService.selectTrainingListByClassId(classId));
+    public ResultEntity<List<Map<String,Object>>> findTrainingListByClassId(@ApiParam("实训记录id") String classId) {
+        if(!StringUtils.hasText(classId)){
+            JwtUser user = TokenProvider.getJWTUser(request);
+            return new ResultEntity<>(HttpStatus.OK, memberService.selectAllTrainingList(user.getSchoolId()));
+        }
+        return new ResultEntity<>(HttpStatus.OK, memberService.selectTrainingListByClassId(classId));
     }
 }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/mappers/MemberMapper.java b/src/main/java/com/sztzjy/forex/trading_trading/mappers/MemberMapper.java
index 31cad77..aa1f983 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/mappers/MemberMapper.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/mappers/MemberMapper.java
@@ -139,8 +139,12 @@ public interface MemberMapper {
     List<Map<String, Object>> selectClassListByTrainingId(@Param("trainingId") String trainingId);
 
 
-    @Select("SELECT class_id,class_grade FROM sys_member where " +
-            "classId =#{classId}  " +
-            "GROUP BY class_grade,class_id")
-    List<Map<String, Object>> selectTrainingListByClassId(@Param("classId") String classId);
+    @Select("SELECT training_id,training_name FROM sys_member where " +
+            "class_id =#{classId}  " +
+            "GROUP BY training_id,training_name")
+    List<Map<String, Object>> selectTrainingListByClassId(@Param("classId") Integer classId);
+
+    @Select("select training_id,training_name from sys_member where school_id=#{schoolId} " +
+            "group by training_id,training_name")
+    List<Map<String, Object>> selectAllTrainingList(int schoolId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java
index 0765f9d..5b35a93 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java
@@ -2,6 +2,7 @@ package com.sztzjy.forex.trading_trading.service;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sztzjy.forex.trading_trading.config.security.JwtUser;
 import com.sztzjy.forex.trading_trading.dto.MemberVO;
 import com.sztzjy.forex.trading_trading.entity.Member;
 import com.sztzjy.forex.trading_trading.entity.MemberExample;
@@ -191,6 +192,10 @@ public class MemberService {
     }
 
     public List<Map<String, Object>> selectTrainingListByClassId(String trainingId) {
-        return memberMapper.selectTrainingListByClassId(trainingId);
+        return memberMapper.selectTrainingListByClassId(Integer.valueOf(trainingId));
+    }
+
+    public List<Map<String,Object>> selectAllTrainingList(int schoolId){
+        return memberMapper.selectAllTrainingList(schoolId);
     }
 }