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

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

@@ -557,11 +557,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 
                         try {
                             // 获取用户头象
-                            List<Integer> collect1 = entry.getValue().stream()
-                                .map(x -> x.getUserId().intValue()).distinct().collect(Collectors.toList());
-
-                            Map<Integer, String> avatarMap = teacherDao.getUsersSimpleInfo(collect1).stream()
-                                .collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getAvatar, (o, n) -> n));
+//                            List<Integer> collect1 = entry.getValue().stream()
+//                                .map(x -> x.getUserId().intValue()).distinct().collect(Collectors.toList());
+//
+//                            Map<Integer, String> avatarMap = teacherDao.getUsersSimpleInfo(collect1).stream()
+//                                .collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getAvatar, (o, n) -> n));
 
                             // 设置用户默认头象
                             for (ImGroupMemberWrapper.ImGroupMember member : entry.getValue()) {
@@ -624,16 +624,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 
                         try {
                             // 获取用户头象
-                            List<Integer> collect1 = entry.getValue().stream()
-                                .map(x -> x.getUserId().intValue()).distinct().collect(Collectors.toList());
-
-                            Map<Integer, String> avatarMap = teacherDao.getUsersSimpleInfo(collect1).stream()
-                                .collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getAvatar, (o, n) -> n));
-
-                            // 设置用户默认头象
-                            for (GroupMemberWrapper.ImGroupMember member : entry.getValue()) {
-                                member.setAvatar(avatarMap.getOrDefault(member.getUserId().intValue(), ""));
-                            }
+//                            List<Integer> collect1 = entry.getValue().stream()
+//                                .map(x -> x.getUserId().intValue()).distinct().collect(Collectors.toList());
+//
+//                            Map<Integer, String> avatarMap = teacherDao.getUsersSimpleInfo(collect1).stream()
+//                                .collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getAvatar, (o, n) -> n));
+//
+//                            // 设置用户默认头象
+//                            for (GroupMemberWrapper.ImGroupMember member : entry.getValue()) {
+//                                member.setAvatar(avatarMap.getOrDefault(member.getUserId().intValue(), ""));
+//                            }
                             // 用户退群
                             imGroupCoreService.groupQuit(entry.getValue(), entry.getKey());
                         } catch (Exception e) {