Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java

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

@@ -227,7 +227,12 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getSportsList(total, firstRule, secondRule, className, professionName);
         }
 
-        //4判断是否展示全部方案
+        //4、判断返回的结果数据是否大于totalResult
+        if (list.size() > totalResult) {
+            list = getVolunteerList(list, totalResult);
+        }
+
+        //5判断是否展示全部方案
         if (queryVo.getIsShowAll() == 0) {
             List<Volunteer> result;
             if (list.size() < 10) {
@@ -242,11 +247,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.ok(volunteerVo);
         }
 
-        //5、判断返回的结果数据是否大于totalResult
-        if (list.size() > totalResult) {
-            list = getVolunteerList(list, totalResult);
-        }
-
         //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
         R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
         if (null != bool && bool.getCode() == 500) {
@@ -1047,14 +1047,14 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         List<Volunteer> result = new ArrayList<>();
         List<Volunteer> otherList = new ArrayList<>();
 
-        //分组，每组数量大于2的，取两条，小于等于则全取
+        //分组，每组数量大于4的，取4条，小于等于则全取
         Map<Double, List<Volunteer>> map = list.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
         ));
 
         for (Map.Entry<Double, List<Volunteer>> entry : map.entrySet()) {
             List<Volunteer> volunteers = entry.getValue();
-            if (volunteers.size() > 2) {
-                for (int i = 0; i < 2; i++) {
+            if (volunteers.size() > 4) {
+                for (int i = 0; i < 4; i++) {
                     Random mRandom = new Random();
                     int number = mRandom.nextInt(volunteers.size());
                     result.add(volunteers.get(number));