|  | @@ -198,11 +198,11 @@ export default {
 | 
											
												
													
														|  |        const matchedMajors = (this.majorsMap[row['studentId']]
 |  |        const matchedMajors = (this.majorsMap[row['studentId']]
 | 
											
												
													
														|  |          ?.majors?.filter(m => m['matchedGroupIds'].some(id => id == groupId)) || [])
 |  |          ?.majors?.filter(m => m['matchedGroupIds'].some(id => id == groupId)) || [])
 | 
											
												
													
														|  |          .groupBy(m => m.collegeName)
 |  |          .groupBy(m => m.collegeName)
 | 
											
												
													
														|  | -      const current = this.prevData.queryGeneration
 |  | 
 | 
											
												
													
														|  | 
 |  | +      const current = this.prevData.activeGeneration
 | 
											
												
													
														|  |        const options = Object.values(config.electiveGenerationOptions)
 |  |        const options = Object.values(config.electiveGenerationOptions)
 | 
											
												
													
														|  |        const histories = row['histories'] || []
 |  |        const histories = row['histories'] || []
 | 
											
												
													
														|  |        const filterHistories = []
 |  |        const filterHistories = []
 | 
											
												
													
														|  | -      for (let g = config.electiveGenerationOptions.rankBalance.value; g > 0; g--) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +      for (let g = current; g > 0; g--) {
 | 
											
												
													
														|  |          const opt = options.find(opt => opt.value == g)
 |  |          const opt = options.find(opt => opt.value == g)
 | 
											
												
													
														|  |          const groupHistories = histories.filter(h => h.generation == g && h.groupId == groupId)
 |  |          const groupHistories = histories.filter(h => h.generation == g && h.groupId == groupId)
 | 
											
												
													
														|  |          if (groupHistories.length) filterHistories.push(groupHistories)
 |  |          if (groupHistories.length) filterHistories.push(groupHistories)
 |