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

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

@@ -929,7 +929,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 throw new BizException("时间区间参数错误，格式为：yyyy-MM-dd");
             }
             List<Future<?>> list = new ArrayList<>();
-            for (List<ImGroup> imGroups : Lists.partition(rows, 40)) {
+            for (List<ImGroup> imGroups : Lists.partition(rows, 10)) {
                 list.add(executorService.submit(() -> {
                     groupTransfer(imGroups);
                 }));
@@ -1007,8 +1007,17 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     imGroupDao.updateImportStatusSuccess(imGroup.getId());
                     continue;
                 }
+
+                groupMembers = groupMembers
+                    .stream()
+                    .filter(next -> next.getUserId() != null && next.getUserId() > 0)
+                    .collect(Collectors.toList());
                 for (ImGroupMember member : groupMembers) {
-                    register(member.getUserId().toString(), getClientType(member.getRoleType()),"");
+                    try {
+                        register(member.getUserId().toString(), getClientType(member.getRoleType()),"");
+                    }catch (Exception e){
+                        log.error("用户注册失败",e);
+                    }
                 }
                 MessageWrapper.ImportGroupMember importGroupMember = new MessageWrapper.ImportGroupMember();
                 importGroupMember.setGroupId(imGroup.getId());
@@ -1041,7 +1050,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     }
 
     private void register(String userId, String clientType,String avatar) {
-        SysUser user = sysUserService.queryUserById(Integer.valueOf(userId));
+        SysUser user = teacherDao.getUser(Integer.valueOf(userId));
         if (user == null) {
             return;
         }