Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -67,12 +67,8 @@ public class MsgBiz {
             ids.add(2);
             ids.add(4);
             query = new Query(Criteria.where("body.type").in(ids));
-            if (appUserDTO != null) {
-                msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
-                PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
-                return ObjectRestResponse.succ(goodPageInfo);
-            }
-            msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+            List<Msg> list = mongoTemplate.find(query, Msg.class, "s_msg");
+            msgList = fetchAndAttach(list, appUserDTO.getImUserid());
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
             return ObjectRestResponse.succ(goodPageInfo);
         }
@@ -103,8 +99,15 @@ public class MsgBiz {
         if(id == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
+        List<Msg> msgList = null;
         Query query = new Query(Criteria.where("id").is(new ObjectId(id)));
-        List<Msg> msgList =  fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
+        if (appUserDTO != null) {
+            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
+            PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
+            return ObjectRestResponse.succ(goodPageInfo);
+        }
+        msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+
         List<MsgVo> msgVoList = replaceMsgResult(msgList);
         if(msgVoList.size() > 0) {
             return ObjectRestResponse.succ(msgVoList.get(0));