diff --git a/src/main/java/com/wj/manager/controller/ScoreController.java b/src/main/java/com/wj/manager/controller/ScoreController.java index 22d73c1..294e2cd 100644 --- a/src/main/java/com/wj/manager/controller/ScoreController.java +++ b/src/main/java/com/wj/manager/controller/ScoreController.java @@ -86,10 +86,7 @@ public class ScoreController extends CommonController{ // 学生各科成绩查询: 指定学年学期的学生各科成绩查询 @LoginCheck(required = true) @GetMapping("/subjects") - public Result> subjectList(@RequestParam Long accountId, @RequestParam Integer year, @RequestParam Integer term) { - if (year == null || term == null) { - return Result.fail(BaseErrorCode.PARAM_INVALID); - } + public Result> subjectList(@RequestParam(required = false) Long accountId, @RequestParam(required = false) Integer year, @RequestParam(required = false) Integer term) { if (accountId == null) { accountId = getUserId(); } diff --git a/src/main/java/com/wj/manager/service/impl/StudentScoreServiceImpl.java b/src/main/java/com/wj/manager/service/impl/StudentScoreServiceImpl.java index 7b37f33..260e784 100644 --- a/src/main/java/com/wj/manager/service/impl/StudentScoreServiceImpl.java +++ b/src/main/java/com/wj/manager/service/impl/StudentScoreServiceImpl.java @@ -97,8 +97,12 @@ public class StudentScoreServiceImpl extends ServiceImpl studentScoreList(Long accountId, Integer year, Integer term) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StudentScoreEntity::getAccountId, accountId); - queryWrapper.eq(StudentScoreEntity::getYear, year); - queryWrapper.eq(StudentScoreEntity::getTerm, term); + if (year != null) { + queryWrapper.eq(StudentScoreEntity::getYear, year); + } + if (term != null) { + queryWrapper.eq(StudentScoreEntity::getTerm, term); + } List scoreList = list(queryWrapper); if (CollectionUtils.isEmpty(scoreList)) { return new ArrayList<>();