Merge branch 'feature-delay-add' into dev

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

@@ -134,17 +134,12 @@ public class MsgBiz {
         }
        number = number == null ? 10 : number;
         Query query = new Query(Criteria.where("body.type").is(4).and("count.praise").gt(getNumber()).and("visible").is(1));
-        query.with(new Sort(Sort.Direction.DESC, "count.praise"));
-        List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
         if (StringUtils.isNotBlank(messageId)) {
-            query = new Query(Criteria.where("_id").is(new ObjectId(messageId)));
-           Msg msg =  mongoTemplate.findOne(query, Msg.class, "s_msg");
-           if (msg != null) {
-               List<Msg> removeOne = new ArrayList<>();
-               removeOne.add(msg);
-               msgList.removeAll(removeOne);
-            }
+            query.addCriteria(Criteria.where("_id").ne(new ObjectId(messageId)));
         }
+        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()) {