Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -164,11 +164,12 @@ public class StudentController extends BaseController {
         studentService.save(studentInfo);
 
         // 加好友
-        if (studentInfo.getId() == null) {
-            SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
+        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, studentInfo.getTenantId()).list();
+                    .eq(Teacher::getTenantId, newStudent.getTenantId()).list();
             teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
                     new HashSet<>(ImmutableList.of(sysUser.getId()))));
         }

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

@@ -152,8 +152,9 @@ public class OpenStudentController extends BaseController {
         studentService.save(studentInfo);
 
         // 加好友
-        if (student.getId() == null) {
-            SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
+        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();