|
@@ -49,7 +49,7 @@ public class FrontExamController {
|
|
|
public AjaxResult subjects()
|
|
public AjaxResult subjects()
|
|
|
{
|
|
{
|
|
|
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
|
|
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
|
|
|
- List<DzSubject> list = dzSubjectService.selectDzSubjectBySubjectIds(ExamType.OHS.equals(sysUser.getExamType()) ? new Long[] {1L, 2L, 3L, 11L} : new Long[] {11L});
|
|
|
|
|
|
|
+ List<DzSubject> list = dzSubjectService.selectDzSubjectBySubjectIds(ExamType.OHS.equals(sysUser.getExamType()) ? new Long[] {11L} : new Long[] {11L}); // 中职暂停 1L, 2L, 3L,
|
|
|
JSONObject evalCounts = JSONObject.parseObject(sysUserService.selectUserById(sysUser.getUserId()).getEvalCounts());
|
|
JSONObject evalCounts = JSONObject.parseObject(sysUserService.selectUserById(sysUser.getUserId()).getEvalCounts());
|
|
|
return AjaxResult.success(list.stream().map(t -> {
|
|
return AjaxResult.success(list.stream().map(t -> {
|
|
|
JSONObject o = new JSONObject();
|
|
JSONObject o = new JSONObject();
|