Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -131,7 +131,7 @@ public class OpenStudentController extends BaseController {
                             }
                         });
                         // 删除好友
-                        imUserFriendService.delFriendByTenantId(tenantId, one.getUserId(),ClientEnum.STUDENT.getCode());
+                        imUserFriendService.delTeacherFriendByTenantId(tenantId, one.getUserId(),ClientEnum.TEACHER.getCode());
                     }
                 }
 
@@ -147,17 +147,6 @@ public class OpenStudentController extends BaseController {
         studentInfo.setTenantId(tenantInfo.getId());
 
         studentService.save(studentInfo);
-
-        // 加好友
-        SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
-        Student newStudent = studentService.getById(sysUser.getId());
-        if (newStudent.getTenantId()!= null && newStudent.getTenantId()!=-1L) {
-            // 自动与机构老师成为好友
-            List<Teacher> teacherList = teacherService.lambdaQuery()
-                    .eq(Teacher::getTenantId, tenantId).list();
-            teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
-                    new HashSet<>(ImmutableList.of(sysUser.getId()))));
-        }
         return succeed();
     }
 }