From 0b357d525c83203162eb053aed9c87604156f94a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept'
---
src/main/java/com/mindskip/xzs/controller/student/EducationController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/student/EducationController.java b/src/main/java/com/mindskip/xzs/controller/student/EducationController.java
index 8778141..0512310 100644
--- a/src/main/java/com/mindskip/xzs/controller/student/EducationController.java
+++ b/src/main/java/com/mindskip/xzs/controller/student/EducationController.java
@@ -28,7 +28,8 @@
@RequestMapping(value = "/subject/list", method = RequestMethod.POST)
public RestResponse<List<SubjectVM>> list() {
User user = getCurrentUser();
- List<Subject> subjects = subjectService.getSubjectByLevel(user.getUserLevel());
+// subjectService.getSubjectByLevel(user.getUserLevel());
+ List<Subject> subjects = subjectService.allSubject();
List<SubjectVM> subjectVMS = subjects.stream().map(d -> {
SubjectVM subjectVM = modelMapper.map(d, SubjectVM.class);
subjectVM.setId(String.valueOf(d.getId()));
--
Gitblit v1.8.0