Merge branch 'master-vedio-list' into dev

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -139,16 +139,16 @@ public class MsgBiz {
         }
         query.with(new Sort(Sort.Direction.DESC, "count.praise"));
         List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
-
-        Set<Msg> resultList = new HashSet<>();
-        if(CollectionUtils.isNotEmpty(msgList)) {
-            if(number >= msgList.size()) {
-                return ObjectRestResponse.succ(msgList);
+        List<MsgVo> msgVoList = replaceMsgResult(msgList);
+        Set<MsgVo> resultList = new HashSet<>();
+        if(CollectionUtils.isNotEmpty(msgVoList)) {
+            if(number >= msgVoList.size()) {
+                return ObjectRestResponse.succ(msgVoList);
             }
             Set<Integer> set = new HashSet<>();
-            RandomUtil.randomSet(msgList.size(), number, set, number);
+            RandomUtil.randomSet(msgVoList.size(), number, set, number);
             for(Integer i : set) {
-                resultList.add(msgList.get(i));
+                resultList.add(msgVoList.get(i));
             }
         }
         return ObjectRestResponse.succ(resultList);