|
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -41,10 +42,6 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
|
|
@Override
|
|
@Override
|
|
public List<Subject> getStudentExamSubjects(Integer examId) {
|
|
public List<Subject> getStudentExamSubjects(Integer examId) {
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
- List<Subject> studentExamSubjects = examSubjectDao.getStudentExamSubjects(examId, sysUser.getId());
|
|
|
|
- if(studentExamSubjects == null || studentExamSubjects.size() == 0){
|
|
|
|
- return new ArrayList<>();
|
|
|
|
- }
|
|
|
|
- return studentExamSubjects;
|
|
|
|
|
|
+ return examSubjectDao.getStudentExamSubjects(examId, sysUser.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|