1.后端添加修改学生接口

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

@@ -601,19 +601,20 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                     .list();
             List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId)
                     .distinct().collect(Collectors.toList());
-            if(groupIdList.isEmpty()){
-//                imGroupService.listByIds(groupIdList).stream().filter(next-> ImGroupType.ORG.equals(next.getType())).map(next->)
-
+            if (!groupIdList.isEmpty()) {
+                List<String> orgGroupIdList = imGroupService.listByIds(groupIdList).stream()
+                        .filter(next -> ImGroupType.ORG.equals(next.getType())).map(ImGroup::getId)
+                        .collect(Collectors.toList());
+                orgGroupIdList.forEach(groupId -> {
+                    try {
+                        imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
+                    } catch (Exception e) {
+                        log.error("学生注册，切换机构退群失败：{}", e.getMessage());
+                    }
+                });
             }
-            groupIdList.forEach(groupId -> {
-                try {
-                    imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
-                } catch (Exception e) {
-                    log.error("学生注册，切换机构退群失败：{}", e.getMessage());
-                }
-            });
-            // 删除好友
-//            imUserFriendService.delTeacherFriendByTenantId(tenantId, one.getUserId(),ClientEnum.TEACHER.getCode());
+//             删除好友
+            imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),ClientEnum.TEACHER.getCode());
         }
 
 

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

@@ -111,30 +111,30 @@ public class OpenStudentController extends BaseController {
                     throw new BizException("已经注册当前机构，请勿重复注册");
                 }
                 // 转到其他机构
-                if ((!Objects.equals(student.getTenantId(), one.getTenantId()))) {
-                    if(student.getUpdateTenant() == null || Boolean.FALSE.equals(student.getUpdateTenant())){
-                        TenantInfo oldTenant = tenantInfoService.getById(one.getTenantId());
-                        throw new BizException(5004, oldTenant.getName());
-                    } else {
-                        // 退群
-                        List<ImGroupMember> groupMembers = imGroupMemberService.lambdaQuery()
-                                .eq(ImGroupMember::getRoleType, ImGroupMemberRoleType.STUDENT)
-                                .eq(ImGroupMember::getIsAdmin, false)
-                                .eq(ImGroupMember::getUserId, one.getUserId())
-                                .list();
-                        List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId)
-                                .distinct().collect(Collectors.toList());
-                        groupIdList.forEach(groupId -> {
-                            try {
-                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT);
-                            } catch (Exception e) {
-                                log.error("学生注册，切换机构退群失败：{}", e.getMessage());
-                            }
-                        });
-                        // 删除好友
-                        imUserFriendService.delTeacherFriendByTenantId(tenantId, one.getUserId(),ClientEnum.TEACHER.getCode());
-                    }
-                }
+//                if ((!Objects.equals(student.getTenantId(), one.getTenantId()))) {
+//                    if(student.getUpdateTenant() == null || Boolean.FALSE.equals(student.getUpdateTenant())){
+//                        TenantInfo oldTenant = tenantInfoService.getById(one.getTenantId());
+//                        throw new BizException(5004, oldTenant.getName());
+//                    } else {
+//                        // 退群
+//                        List<ImGroupMember> groupMembers = imGroupMemberService.lambdaQuery()
+//                                .eq(ImGroupMember::getRoleType, ImGroupMemberRoleType.STUDENT)
+//                                .eq(ImGroupMember::getIsAdmin, false)
+//                                .eq(ImGroupMember::getUserId, one.getUserId())
+//                                .list();
+//                        List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId)
+//                                .distinct().collect(Collectors.toList());
+//                        groupIdList.forEach(groupId -> {
+//                            try {
+//                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT);
+//                            } catch (Exception e) {
+//                                log.error("学生注册，切换机构退群失败：{}", e.getMessage());
+//                            }
+//                        });
+//                        // 删除好友
+//                        imUserFriendService.delTeacherFriendByTenantId(tenantId, one.getUserId(),ClientEnum.TEACHER.getCode());
+//                    }
+//                }
 
                 // 更新头像
                 if (StringUtils.isEmpty(student.getAvatar())) {