Merge branch 'feature/1020-tencent-im' into test

mec-biz/src/main/java/com/ym/mec/biz/service/im/impl/ImGroupCoreServiceImpl.java

@@ -7,7 +7,6 @@ import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.tools.ThreadPool;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
-import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.ImGroupMemberPlus;
 import com.ym.mec.biz.dal.entity.ImGroupPlus;
 import com.ym.mec.biz.dal.enums.EFriendRoleType;
@@ -146,8 +145,8 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
         ImGroupPlus group = JSON.parseObject(imGroup.jsonString(), ImGroupPlus.class);
         group.setId(imGroup.getGroupId());
         // 群默认头象
-        if (StringUtils.isBlank(imGroup.getImg()) && Objects.nonNull(imGroup.getGroupType())) {
-            imGroup.setImg(imGroup.getGroupType().getAvatar());
+        if (StringUtils.isBlank(group.getImg()) && Objects.nonNull(group.getGroupType())) {
+            group.setImg(group.getGroupType().getAvatar());
         }
         // 保存群组信息
         imGroupService.saveOrUpdate(group);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -772,7 +772,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     public List<ImGroup> queryByUserId(ImGroupWrapper.ImQuery query) {
-        return imGroupDao.getByUserId(query);
+        List<ImGroup> imGroups = imGroupDao.getByUserId(query);
+        for (ImGroup item : imGroups) {
+            if (Objects.nonNull(item.getGroupType()) && StringUtils.isBlank(item.getImg())) {
+                item.setImg(item.getGroupType().getAvatar());
+            }
+        }
+        return imGroups;
     }
 
     /**