1
0

2 Ревизии fc1edee500 ... 15aa90e650

Автор SHA1 Съобщение Дата
  mingfu 15aa90e650 Merge branch 'master' of http://49.234.186.218:9000/root/ieplus преди 1 седмица
  mingfu 3dd91972f9 技能分匹配规则时降级 преди 1 седмица
променени са 1 файла, в които са добавени 4 реда и са изтрити 0 реда
  1. 4 0
      ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

+ 4 - 0
ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

@@ -269,6 +269,10 @@ public class VoluntaryService {
         cond.put("examineeType", examType);
         cond.put("examineeType", examType);
 
 
         List<AEnrollScore> enrollScoreList = aEnrollScoreMapper.selectListByRuleCond(cond);
         List<AEnrollScore> enrollScoreList = aEnrollScoreMapper.selectListByRuleCond(cond);
+        if (CollectionUtils.isEmpty(enrollScoreList) && cond.containsKey("majorGroup")) {
+            cond.put("majorGroup", "");
+            enrollScoreList = aEnrollScoreMapper.selectListByRuleCond(cond);
+        }
         List<VoluntaryDto.AIRenderRule> ruleList = Lists.newArrayList();
         List<VoluntaryDto.AIRenderRule> ruleList = Lists.newArrayList();
         Set<String> existItemSet  = Sets.newHashSet();
         Set<String> existItemSet  = Sets.newHashSet();
         String vt;
         String vt;