Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

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

@@ -411,8 +411,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SysUser insertSysUser(TeacherSubmitReq teacherSubmitReq) {
         SysUser sysUser = new SysUser();
         sysUser = getUserDetil(sysUser, teacherSubmitReq);
-        //初始密码，手机号后6位
-        String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
+        //初始密码，klx+手机号四位
+        String password = "klx" + sysUser.getPhone().substring(sysUser.getPhone().length() - 4);
         sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
         //插入
         int num = employeeDao.insertSysUser(sysUser);
@@ -961,15 +961,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             // 删除好友关系
             imUserFriendService.delFriendByTenantId(teacher.getTenantId(), teacher.getUserId());
 
-            // 机构老师与学生互加好友关系
-            if (Optional.ofNullable(teacher.getTenantId()).orElse(-1L) > 0) {
-                // 自动与机构老师成为好友
-                Set<Long> collect = studentService.lambdaQuery()
-                        .eq(Student::getTenantId, updateTenant.getTenantId()).list().stream()
-                        .map(Student::getUserId).collect(Collectors.toSet());
-
-                imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
-            }
         }else {
 
             // 平台老师处理流程
@@ -980,6 +971,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             }
         }
 
+        // 机构老师与学生互加好友关系
+        if (Optional.ofNullable(updateTenant.getTenantId()).orElse(-1L) > 0) {
+            // 自动与机构老师成为好友
+            Set<Long> collect = studentService.lambdaQuery()
+                    .eq(Student::getTenantId, updateTenant.getTenantId()).list().stream()
+                    .map(Student::getUserId).collect(Collectors.toSet());
+
+            imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
+        }
+
         teacher.setTenantId(updateTenant.getTenantId());
         this.updateById(teacher);
 

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

@@ -263,6 +263,7 @@ public class TenantInfoController extends BaseController {
                 tenantInfoService.lambdaUpdate()
                         .eq(TenantInfo::getId, user.getTenantId())
                         .set(TenantInfo::getUserId, userId)
+                        .set(TenantInfo::getPhone,sysUser.getPhone())
                         .update();
             }