Merge branch 'feature/0721-tenant' into develop

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -184,4 +184,5 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
 
     void updateStudentHideFlag(@Param("userId") Long userId, @Param("hideFlag") int hideFlag);
 
+    void updateAvatar(@Param("clientId") String clientId, @Param("avatar") String avatar,@Param("id") Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -295,6 +295,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         }
         //更新融云用户基本信息
         this.updateRongCloudUserInfo(id, setReq.getClientType());
+
+        // 更新老师、学生头像
+        if (StringUtils.isNotEmpty(setReq.getAvatar())) {
+            if (EClientType.STUDENT.getCode().equals(setReq.getClientType()) ||
+                    EClientType.TEACHER.getCode().equals(setReq.getClientType()) ||
+                    EClientType.SYSTEM.getCode().equals(setReq.getClientType())) {
+                sysUserDao.updateAvatar(setReq.getClientId(), setReq.getAvatar(), id);
+            }
+        }
     }
 
     @Override

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -370,4 +370,16 @@
     <update id="updateStudentHideFlag">
         update student set hide_flag_ = #{hideFlag} where user_id_ = #{userId}
     </update>
+
+    <update id="updateAvatar">
+        <if test="sysUserType == 'STUDENT'">
+            update student set avatar_ = #{avatar} where user_id_ = #{id}
+        </if>
+        <if test="sysUserType == 'TEACHER'">
+            update teacher set avatar_ = #{avatar} where user_id_ = #{id}
+        </if>
+        <if test="sysUserType == 'SYSTEM'">
+            update sys_user set avatar_ = #{avatar} where id_ = #{id}
+        </if>
+    </update>
 </mapper>

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

@@ -167,6 +167,11 @@ public class TenantInfoController extends BaseController {
             throw new BizException("请登录");
         }
 
+        TenantStaff staff = tenantStaffService.getByUserId(user.getId());
+        if (Objects.nonNull(staff)) {
+            // 设置用户机构ID
+            user.setTenantId(staff.getTenantId());
+        }
         //如果传手机号
         if (StringUtils.isNotBlank(sysUser.getPhone())) {
 
@@ -252,7 +257,7 @@ public class TenantInfoController extends BaseController {
                     .set(TenantStaff::getUserId, userId)
                     .update();
 
-            // 更新机构信息表中的用户昵称
+            // 更新机构信息表中的用户
             if (Optional.ofNullable(user.getTenantId()).orElse(-1L) > 0) {
 
                 tenantInfoService.lambdaUpdate()
@@ -277,6 +282,7 @@ public class TenantInfoController extends BaseController {
                     .set(TenantStaff::getUpdateTime, LocalDateTime.now())
                     .update();
 
+
             // 更新机构信息表中的用户昵称
             if (StringUtils.isNotBlank(sysUser.getUsername()) && Optional.ofNullable(user.getTenantId()).orElse(-1L) > 0) {
 

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

@@ -109,10 +109,10 @@ public class OpenStudentController extends BaseController {
                 if (one.getTenantId().equals(-1L)) {
                     throw new BizException("该手机号已经注册为平台学生");
                 }
-//                if (one.getTenantId().equals(tenantId)) {
-//                    //已经注册当前机构，请勿重复注册
-//                    throw new BizException(5004, tenantInfo.getName());
-//                }
+                if (one.getTenantId().equals(tenantId)) {
+                    //已经注册当前机构，请勿重复注册
+                    throw new BizException("已经注册当前机构，请勿重复注册");
+                }
                 // 转到其他机构
                 if ((!Objects.equals(student.getTenantId(), one.getTenantId()))) {
                     if(student.getUpdateTenant() == null || Boolean.FALSE.equals(student.getUpdateTenant())){