浏览代码

等效分超了一分一段时报错

mingfu 2 天之前
父节点
当前提交
ebcc88f8f3
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      ie-admin/src/main/java/com/ruoyi/web/service/ZyService.java

+ 4 - 1
ie-admin/src/main/java/com/ruoyi/web/service/ZyService.java

@@ -522,7 +522,10 @@ public class ZyService {
 //                universityMarjorMap.put(Long.parseLong(us.getUniversityId()), submitMarjors);
 //            }
 //        }
-        Integer baseYearScore = currSubmitYear.equals(currYear) ? query.getScore().intValue() : getScoreOfLastYear(location, currYear, query.getMode(), query.getScore().intValue());
+        Integer baseYearScore = query.getScore();
+        if(!currSubmitYear.equals(currYear) && null == (baseYearScore = getScoreOfLastYear(location, currYear, query.getMode(), baseYearScore))) {
+            throw new RuntimeException("分数不在范围");
+        }
         Integer historyIndex = currSubmitYear.equals(currYear) ? 0 : 1;
 
         boolean scoreLock = getScoreLock(location);