技能可能包含文化科目，文化科目也需要过滤

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

@@ -593,12 +593,7 @@ public class LearnTeacherService {
                 examType = null != sysUser.getExamType() ? sysUser.getExamType().name() : ExamType.OHS.name();
             }
             AMarjorPlan plan = planList.get(0);
-            Set<Long> idSet;
-            if((null == subjectId || subjectId >= 10) && (null == year || plan.getMatchYear().equals(year))) {
-                idSet = getStudentKnowledgeIdSet(plan.getMatchYear(), plan, sysUser.getLocation(), examType);
-            } else {
-                idSet = Sets.newHashSet();
-            }
+            Set<Long> idSet = getStudentKnowledgeIdSet(plan.getMatchYear(), plan, sysUser.getLocation(), examType);
             if(null == subjectId || subjectId < 10) {
                 LearnCultureKnowledge ckCond = new LearnCultureKnowledge();
                 ckCond.setUniversityId(plan.getUniversityId());