Merge branch 'feature/0721-tenant' into develop

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

@@ -425,7 +425,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             // 自动与机构老师成为好友
             Set<Long> collect = studentService.lambdaQuery()
                     .eq(Student::getTenantId, teacher.getTenantId()).list().stream()
-                    .map(Student::getUserId).collect(Collectors.toSet());
+                    .map(Student::getUserId).filter(next->!next.equals(teacher.getUserId())).collect(Collectors.toSet());
 
             imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
         }
@@ -516,14 +516,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             }
 
             // 机构老师与学生互加好友关系
-            if (Optional.ofNullable(teacher.getTenantId()).orElse(-1L) > 0) {
-                // 自动与机构老师成为好友
-                Set<Long> collect = studentService.lambdaQuery()
-                        .eq(Student::getTenantId, teacher.getTenantId()).list().stream()
-                        .map(Student::getUserId).collect(Collectors.toSet());
-
-                imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
-            }
+//            if (Optional.ofNullable(teacher.getTenantId()).orElse(-1L) > 0) {
+//                // 自动与机构老师成为好友
+//                Set<Long> collect = studentService.lambdaQuery()
+//                        .eq(Student::getTenantId, teacher.getTenantId()).list().stream()
+//                        .map(Student::getUserId).collect(Collectors.toSet());
+//
+//                imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
+//            }
 
             //插入老师账户表
             UserAccount oldAcc = userAccountService.getById(teacherSubmitReq.getUserId());
@@ -1039,9 +1039,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             // 自动与机构老师成为好友
             Set<Long> collect = studentService.lambdaQuery()
                     .eq(Student::getTenantId, updateTenant.getTenantId()).list().stream()
-                    .map(Student::getUserId).collect(Collectors.toSet());
+                    .map(Student::getUserId).filter(next -> !next.equals(teacher.getUserId()))
+                    .collect(Collectors.toSet());
 
-            imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
+            if (!collect.isEmpty()) {
+                imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
+            }
         }
 
         teacher.setTenantId(updateTenant.getTenantId());