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