Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -119,7 +119,7 @@
                     #{id}
                 </foreach>
             </if>
-            order by lowest_mark desc
+            order by major_name,lowest_mark desc
             limit #{number}
         </where>
     </select>

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -241,11 +241,11 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getVolunteerList(list, totalResult);
         }
 
-        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
-        boolean bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
-        if (!bool) {
-            return R.error("保存方案查询记录失败!");
-        }
+//        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
+//        boolean bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
+//        if (!bool) {
+//            return R.error("保存方案查询记录失败!");
+//        }
 
         //排序
         list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());