修正排序异常及年度过滤

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

@@ -737,7 +737,7 @@ public class VoluntaryService {
                 continue;
             }
             for(Map<Long, List<AMarjorPlan>> tmpMap : bothPlanList) {
-                if (!mp.getYear().equals(planYear) && tmpMap == currUniversityMajorPlansMap) {
+                if (!mp.getMatchYear().equals(planYear) && tmpMap == currUniversityMajorPlansMap) {
                     continue;
                 }
                 List<AMarjorPlan> tmpMpList = tmpMap.get(mp.getUniversityId());

ie-system/src/main/resources/mapper/syzy/BBusiWishUniversitiesMapper.xml

@@ -278,7 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </where>
     <choose>
       <when test="filterRank!= null and filterRank"> order by star desc, code </when>
-      <otherwise> code</otherwise>
+      <otherwise> order by code</otherwise>
     </choose>
   </select>