|
@@ -622,6 +622,12 @@ public class VoluntaryService {
|
|
|
.filter(t -> needGroup.equals(StringUtils.trimToEmpty(t.getMajorGroups())))
|
|
.filter(t -> needGroup.equals(StringUtils.trimToEmpty(t.getMajorGroups())))
|
|
|
.collect(Collectors.groupingBy(t -> StringUtils.isNotBlank(t.getMajorNames())));
|
|
.collect(Collectors.groupingBy(t -> StringUtils.isNotBlank(t.getMajorNames())));
|
|
|
|
|
|
|
|
|
|
+ if(majorEnrollScoresMap.isEmpty() && StringUtils.isNotBlank(needGroup)) {
|
|
|
|
|
+ majorEnrollScoresMap = scoreList.stream()
|
|
|
|
|
+ .filter(t -> StringUtils.isBlank(t.getMajorGroups()))
|
|
|
|
|
+ .collect(Collectors.groupingBy(t -> StringUtils.isNotBlank(t.getMajorNames())));
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
List<AEnrollScore> tmpEnrollScoreList = majorEnrollScoresMap.get(Boolean.TRUE);
|
|
List<AEnrollScore> tmpEnrollScoreList = majorEnrollScoresMap.get(Boolean.TRUE);
|
|
|
AEnrollScore skillEnrollScore = null;
|
|
AEnrollScore skillEnrollScore = null;
|
|
|
if (null != tmpEnrollScoreList) {
|
|
if (null != tmpEnrollScoreList) {
|