职业库中相关专业修复

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

@@ -63,8 +63,10 @@ public class FrontSyVocationalController extends BaseController {
         SyVocationalOverview vocationalOverview = vocationalOverviewService.selectSyVocationalOverviewByCode(code);
         JSONArray marjorList = new JSONArray();
         Set<String> marjorCodeSet = syTestMajorService.loadMarjorCodes();
+        Set<String> marjorNameSet = syTestMajorService.loadMarjorNames();
         vocationalOverview.getPostMajors().forEach(t -> {
-            if (marjorCodeSet.contains(((JSONObject) t).getString("code"))) {
+//            if (marjorCodeSet.contains(((JSONObject) t).getString("code"))) {
+            if (marjorNameSet.contains(((JSONObject) t).getString("name"))&&marjorCodeSet.contains(((JSONObject) t).getString("code"))) {
                 marjorList.add(t);
             }
         });

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

@@ -6,9 +6,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.ruoyi.common.core.content.VistorContextHolder;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -46,6 +48,7 @@ public class SyTestMajorService {
     private final ExamUtilService examUtilService;
     private final RedisCache redisCache;
     private Set<String> marjorCodeSet;
+    private Set<String> marjorNameSet;
 
     private ObjectMapper om = new ObjectMapper();
     // key1 category, key2 value(RIA...)
@@ -78,11 +81,25 @@ public class SyTestMajorService {
 
     public Set<String> loadMarjorCodes() {
         if(null == marjorCodeSet) {
+            ExamType examType = VistorContextHolder.getExamType();
 //            marjorCodeSet = syMajorMajorMapper.selectSyMajorMajorList(new SyMajorMajor()).stream().map( t -> t.getMajorCode()).collect(Collectors.toSet());
-            marjorCodeSet = majorMapper.selectSyMajorList(new SyMajor()).stream().map( t -> t.getCode()).collect(Collectors.toSet());
+            marjorCodeSet = majorMapper.selectSyMajorList(new SyMajor()).stream()
+                    .filter(t -> examType != null && examType.title().equals(t.getExamType()))
+                    .map( t -> t.getCode()).collect(Collectors.toSet());
         }
         return marjorCodeSet;
     }
+
+    public Set<String> loadMarjorNames() {
+        if(null == marjorNameSet) {
+            ExamType examType = VistorContextHolder.getExamType();
+            marjorNameSet = majorMapper.selectSyMajorList(new SyMajor()).stream()
+                    .filter(t -> examType != null && examType.title().equals(t.getExamType()))
+                    .map( t -> t.getName())
+                    .collect(Collectors.toSet());
+        }
+        return marjorNameSet;
+    }
     public List<SyTestExaminee> getTestListWithStatus(Integer testType, Integer[] states) {
         Map cond = Maps.newHashMap();
         cond.put("paperId", testType.longValue());