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 dfcc6c0..c19799b 100644 --- a/service/imService.go +++ b/service/imService.go @@ -317,7 +317,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