|
@@ -1641,6 +1641,12 @@ public class VoluntaryService {
|
|
|
}
|
|
}
|
|
|
record.setRank(rank);
|
|
record.setRank(rank);
|
|
|
}
|
|
}
|
|
|
|
|
+ Collections.sort(voluntaryRecord.getMajors(), new Comparator<VoluntaryDto.VoluntaryMajorRecord>() {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public int compare(VoluntaryDto.VoluntaryMajorRecord o1, VoluntaryDto.VoluntaryMajorRecord o2) {
|
|
|
|
|
+ return o1.getRank().compareTo(o2.getRank());
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
updateWishRecord(wishRecord, voluntaryRecordList);
|
|
updateWishRecord(wishRecord, voluntaryRecordList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1654,6 +1660,12 @@ public class VoluntaryService {
|
|
|
}
|
|
}
|
|
|
record.setRank(rank);
|
|
record.setRank(rank);
|
|
|
}
|
|
}
|
|
|
|
|
+ Collections.sort(voluntaryRecordList, new Comparator<VoluntaryDto.VoluntaryRecord>() {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public int compare(VoluntaryDto.VoluntaryRecord o1, VoluntaryDto.VoluntaryRecord o2) {
|
|
|
|
|
+ return o1.getRank().compareTo(o2.getRank());
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
updateWishRecord(wishRecord, voluntaryRecordList);
|
|
updateWishRecord(wishRecord, voluntaryRecordList);
|
|
|
}
|
|
}
|
|
|
|
|
|