Merge branch 'feature/0721-tenant'

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

@@ -1007,8 +1007,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             // 删除好友关系
             imUserFriendService.delFriendByTenantId(teacher.getTenantId(), teacher.getUserId());
 
-        }else {
+        }
 
+        if (updateTenant.getTenantId().equals(-1L)) {
             // 平台老师处理流程
             if (ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
                 // 解绑后，结算方式如果是机构，默认调整为老师

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

@@ -240,7 +240,8 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
             }
             teacherDao.update(null, Wrappers.<Teacher>lambdaUpdate()
                     .eq(Teacher::getUserId, unbindRecord.getUserId())
-                    .set(Teacher::getSettlementFrom, ESettlementFrom.TEACHER)
+                    .set(ESettlementFrom.TENANT.equals(teacher.getSettlementFrom()), Teacher::getSettlementFrom,
+                            ESettlementFrom.TEACHER)
                     .set(Teacher::getTenantId, -1L));
         }
 

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

@@ -88,6 +88,7 @@ public class StudentController extends BaseController {
         TenantInfo tenantInfo = getTenantInfo();
         query.setTenantId(tenantInfo.getId());
         query.setDelFlag(YesOrNoEnum.NO);
+        query.setLockFlag(UserLockFlag.NORMAL);
         query.setOrderBy("u.username_ asc");
 
         IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);

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

@@ -275,6 +275,12 @@ public class TenantInfoController extends BaseController {
                 sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
             }
 
+            // 更新用户头象
+            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+            updateSysUser.setId(user.getId());
+            updateSysUser.setAvatar(sysUser.getAvatar());
+            sysUserMapper.updateById(updateSysUser);
+
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()
                     .eq(TenantStaff::getUserId, user.getId())