From 3e85b9e199705adea11fddd1daf7b36255bbc9b8 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Mon, 7 Oct 2024 17:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/im.go            | 6 +++---
 service/imService.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dao/im.go b/dao/im.go
index 6fd636b..f5848a5 100644
--- a/dao/im.go
+++ b/dao/im.go
@@ -78,8 +78,8 @@ func GetMsgGroupByIndex(group_id, index int) ([]GroupMessage, error) {
 
 }
 
-func GetGroupRequestUsers(user_id int) []GroupRequest {
-	var users []GroupRequest
+func GetGroupRequestUsers(user_id int) []GroupRequestUsers {
+	var users []GroupRequestUsers
 	DB.Debug().Raw("select id,im_id,name,email,group_id FROM (SELECT im_id,from_user_id,group_id FROM (( SELECT id as im_id,from_user_id,group_id FROM messages WHERE type=? and status=? ) as m JOIN groups as g on g.id=m.group_id ) where g.auth_id=? ) as e JOIN users as u ON e.from_user_id=u.id", proto.MSG_TYPE_GROUP_ADD, 0, user_id).Scan(&users)
 	return users
 }
@@ -278,7 +278,7 @@ type FriendRequest struct {
 	Age   int    `json:"age"`
 }
 
-type GroupRequest struct {
+type GroupRequestUsers struct {
 	FriendRequest
 	GroupID int `json:"group_id"`
 }
diff --git a/service/imService.go b/service/imService.go
index 08d1147..b50a192 100644
--- a/service/imService.go
+++ b/service/imService.go
@@ -311,7 +311,7 @@ func GetGroupByNameLike(name string) []dao.Group {
 	return groups
 }
 
-func GetGroupRequestUsers(user_id int) []dao.GroupRequest {
+func GetGroupRequestUsers(user_id int) []dao.GroupRequestUsers {
 	//获取群聊请求
 	users := dao.GetGroupRequestUsers(user_id)
 	return users