|
|
@@ -93,6 +93,10 @@ public class FrontStudentController extends BaseController {
|
|
|
sCond.setLocations(sysUser.getLocation());
|
|
|
sCond.setExamTypes(sysUser.getExamType().name());
|
|
|
List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
|
|
|
+ if(ExamType.VHS.equals(sysUser.getExamType())) {
|
|
|
+ Long validSubjectId = null != sysUser.getExamMajor() ? sysUser.getExamMajor().longValue() : 0L;
|
|
|
+ return AjaxResult2.success(list.stream().filter(t -> t.getSubjectId() < 10 || t.getSubjectId().equals(validSubjectId)).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
return AjaxResult2.success(list);
|
|
|
}
|
|
|
|