From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
index c752eeb..de42f52 100644
--- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
+++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
@@ -27,6 +27,8 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.GROUP_MEMBER_NOT_IN_GROUP;
@@ -67,8 +69,9 @@
} else if (groupId != null && userId != null) {
member = groupMemberService.getGroupMember(groupId, userId);
} else {
- // 閬垮厤 selectByGroupIdAndUserId 鏀跺埌 null 鍙傛暟璧板叏琛ㄦ壂 / 鎶� SQL 寮傚父
- throw new IllegalArgumentException("鍙傛暟缂哄け锛氶渶浼� id 鎴� (groupId, userId)");
+ // 閬垮厤 selectByGroupIdAndUserId 鏀跺埌 null 鍙傛暟璧板叏琛ㄦ壂 / 鎶� SQL 寮傚父銆�
+ // 杩欓噷灞炰簬瀹㈡埛绔弬鏁伴棶棰橈紝鎶涗笟鍔″紓甯歌繑鍥� 400锛屼笉瑕佺敤 IllegalArgumentException 鍙樻垚 500
+ throw exception0(BAD_REQUEST.getCode(), "鍙傛暟缂哄け锛氶渶浼� id 鎴� (groupId, userId)");
}
if (member == null) {
return success(null);
--
Gitblit v1.9.3