From cbb93384a5f4fe276750f676ae181b4a8c48b268 Mon Sep 17 00:00:00 2001
From: "ray.ma" <ray.ma@bkyo.io>
Date: Thu, 24 Apr 2025 17:22:37 +0800
Subject: [PATCH] modify scoreList

---
 .../java/com/wj/manager/controller/ScoreController.java   | 5 +----
 .../wj/manager/service/impl/StudentScoreServiceImpl.java  | 8 ++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

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<List<ScoreInfo>> subjectList(@RequestParam Long accountId, @RequestParam Integer year, @RequestParam Integer term) {
-        if (year == null || term == null) {
-            return Result.fail(BaseErrorCode.PARAM_INVALID);
-        }
+    public Result<List<ScoreInfo>> 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<StudentScoreMapper, Stu
     public List<ScoreInfo> studentScoreList(Long accountId, Integer year, Integer term) {
         LambdaQueryWrapper<StudentScoreEntity> 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<StudentScoreEntity> scoreList = list(queryWrapper);
         if (CollectionUtils.isEmpty(scoreList)) {
             return new ArrayList<>();