Merge branch 'feature/1019-tenant' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -670,14 +670,14 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),
                     ClientEnum.STUDENT.getCode());
 
-            // 与新机构老师成为好友
-            if (newTenantId != -1L) {
-                // 自动与机构老师成为好友
-                QueryWrapper<Teacher> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(Teacher::getTenantId, student.getTenantId());
-                List<Teacher> teacherList = teacherDao.selectList(queryWrapper);
-                teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
-                        new HashSet<>(ImmutableList.of(student.getUserId()))));
+            // 加好友
+            QueryWrapper<Teacher> query = new QueryWrapper<>();
+            query.lambda().eq(Teacher::getTenantId, newTenantId);
+            List<Teacher> teachers = teacherDao.selectList(query);
+            for (Teacher teacher : teachers) {
+                HashSet<Long> studentIds = new HashSet<>();
+                studentIds.add(student.getUserId());
+                imUserFriendService.saveUserFriend(teacher.getUserId(), studentIds);
             }
         }