河南科目变更参数名，支持基础/专业/所有/不限制多个情况

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontPaperController.java

@@ -72,8 +72,8 @@ public class FrontPaperController {
     @ApiOperation("02 考试科目")
     @GetMapping(value = "subject")
     public AjaxResult2<List<DzSubject>> getSubject(@ApiParam("定向") @RequestParam(defaultValue = "false") boolean directed,
-                                                   @ApiParam("类型") @RequestParam(required = false) Integer subjectId) {
-        return AjaxResult2.success(studentService.getSubjectList(directed, subjectId));
+                                                   @ApiParam("类型 0基础1专业2所有") @RequestParam(required = false) Integer subjectType) {
+        return AjaxResult2.success(studentService.getSubjectList(directed, subjectType));
     }
 
     @ApiOperation("03 知识点树")

ie-admin/src/main/java/com/ruoyi/web/service/StudentService.java

@@ -52,7 +52,7 @@ public class StudentService {
         this.learnAnswerMapper = learnAnswerMapper;
     }
 
-    public List<DzSubject> getSubjectList(boolean directed, Integer subjectId) {
+    public List<DzSubject> getSubjectList(boolean directed, Integer subjectType) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         DzSubject sCond = new DzSubject();
         sCond.setLocations(sysUser.getLocation());
@@ -60,18 +60,17 @@ public class StudentService {
         List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
         Set<Long> subjectIdSet;
         if (!directed) {
-            if(null == subjectId) {
+            if(null == subjectType) { // 非普通是返回的所有，还不确定有哪些
                 return list;
-            }
-            if(subjectId > 0) {
-                Integer userSubjectId = SecurityUtils.getLoginUser().getUser().getSelectSubject();
-                if(null != userSubjectId) {
-                    subjectIdSet = Sets.newHashSet(userSubjectId.longValue());
-                } else {
-                    subjectIdSet = Sets.newHashSet(subjectId.longValue());
-                }
-            } else {
+            } // 职高对口
+            Integer userSubjectId = SecurityUtils.getLoginUser().getUser().getSelectSubject();
+            if(subjectType == 1) {
+                subjectIdSet = null == userSubjectId ? Sets.newHashSet() : Sets.newHashSet(userSubjectId.longValue());
+            } else { // 职高对口所有
                 subjectIdSet = Sets.newHashSet(1L, 2L, 3L);
+                if(subjectType == 2) {
+                    subjectIdSet.add(userSubjectId.longValue());
+                }
             }
         } else {
             LearnStudent learnStudent = learnStudentService.selectLearnStudentByStudentId(SecurityUtils.getUserId());