diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java index cff3af0..adaf094 100644 --- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java +++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java @@ -173,8 +173,8 @@ RecordController { } List idByCategoryName = categoryService.getIdByCategoryName(categoryName); for (Integer i : idByCategoryName) { - Integer sid = recordService.getSidByCategoryId(i); - studentIds.add(sid); + List sid = recordService.getSidByCategoryId(i); + studentIds.addAll(sid); } List records=new ArrayList<>(); HashSet studentIds1= new HashSet<>(studentIds); @@ -214,9 +214,9 @@ RecordController { } List idByCategoryName = categoryService.getIdByCategoryName(categoryName); for (Integer i : idByCategoryName) { - Integer sid = recordService.getSidByCategoryId(i); + List sid = recordService.getSidByCategoryId(i); if(sid!=null) { - studentIds.add(sid); + studentIds.addAll(sid); } } List records=new ArrayList<>(); diff --git a/src/main/java/top/suyiiyii/sims/controller/UserController.java b/src/main/java/top/suyiiyii/sims/controller/UserController.java index ed3b62a..8348da7 100644 --- a/src/main/java/top/suyiiyii/sims/controller/UserController.java +++ b/src/main/java/top/suyiiyii/sims/controller/UserController.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; -import jakarta.validation.constraints.Max; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java index 2ccd16c..a35517c 100644 --- a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java +++ b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java @@ -76,7 +76,7 @@ public interface RecordMapper { @Select("select student_id from record where category_id = #{i}") - Integer getSidByCategoryId(Integer i); + List getSidByCategoryId(Integer i); @Select("SELECT * FROM record WHERE student_id = #{sid} LIMIT #{page},#{size}") List getRecordsById(int page, int size, Integer sid); @Select("SELECT id FROM record WHERE id = #{id}") diff --git a/src/main/java/top/suyiiyii/sims/service/RecordService.java b/src/main/java/top/suyiiyii/sims/service/RecordService.java index 69edbd1..3b525b2 100644 --- a/src/main/java/top/suyiiyii/sims/service/RecordService.java +++ b/src/main/java/top/suyiiyii/sims/service/RecordService.java @@ -74,7 +74,7 @@ public class RecordService { - public Integer getSidByCategoryId(Integer i) { + public List getSidByCategoryId(Integer i) { return recordMapper.getSidByCategoryId(i); }