合并冲突

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

@@ -125,7 +125,7 @@ public class OpenStudentController extends BaseController {
                                 .distinct().collect(Collectors.toList());
                         groupIdList.forEach(groupId -> {
                             try {
-                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT);
+                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT, true);
                             } catch (Exception e) {
                                 log.error("学生注册，切换机构退群失败：{}", e.getMessage());
                             }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;

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

@@ -539,7 +539,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                     .collect(Collectors.toList());
             for (String groupId : groupIdList) {
                 try {
-                    imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
+                    imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT, true);
                 } catch (Exception e) {
                     log.error("退出群聊失败", e);
                 }

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

@@ -125,7 +125,7 @@ public class OpenStudentController extends BaseController {
                                 .distinct().collect(Collectors.toList());
                         groupIdList.forEach(groupId -> {
                             try {
-                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT);
+                                imGroupService.quit(groupId, one.getUserId(), ClientEnum.STUDENT, true);
                             } catch (Exception e) {
                                 log.error("学生注册，切换机构退群失败：{}", e.getMessage());
                             }