Explorar o código

当有组名查不到规则时,降级到无组的规则中

mingfu hai 2 días
pai
achega
4e63110637

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

@@ -622,6 +622,12 @@ public class VoluntaryService {
                     .filter(t -> needGroup.equals(StringUtils.trimToEmpty(t.getMajorGroups())))
                     .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);
             AEnrollScore skillEnrollScore = null;
             if (null != tmpEnrollScoreList) {