|
@@ -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;
|