Merge branch 'pt' of https://gitee.com/ccsens_s/ccsenscloud into pt

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -611,7 +611,7 @@ public class ScreenService implements IScreenService {
                 groupVo.setGroupName(gameGroup.getName());
 
                 Object o = redisUtil.get(gameGroup.getId() + GameConstant.GAME_GROUP_NUM);
-                if (ObjectUtil.isNotNull(o)) {
+                if (ObjectUtil.isNull(o)) {
                     o = 0;
                 }
                 groupVo.setTotalMembers((int)o);
@@ -630,7 +630,8 @@ public class ScreenService implements IScreenService {
                 vos.add(groupVo);
             });
             if(gameRecord.getRankRule() == GameConstant.RANK_RULE_AVA){
-                CollectionUtil.sort(vos, Comparator.comparingInt(ScreenVo.GroupVo::getScore));
+//                CollectionUtil.sort(vos, Comparator.comparingInt(ScreenVo.GroupVo::getScore));
+                CollectionUtil.sort(vos,(t1,t2)-> t2.getScore() - t1.getScore());
             }
             return vos;
         }