From fd19cd89a3d066d808d350d28132afd6342e370f Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 17 Mar 2023 16:24:47 +0800
Subject: [PATCH] friend

---
 internal/api/friend.go           | 2 +-
 pkg/rpcclient/convert/convert.go | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/api/friend.go b/internal/api/friend.go
index 73f1c1177..4c47477e3 100644
--- a/internal/api/friend.go
+++ b/internal/api/friend.go
@@ -46,7 +46,7 @@ func (o *Friend) GetFriendApplyList(c *gin.Context) {
 }
 
 func (o *Friend) GetSelfApplyList(c *gin.Context) {
-	a2r.Call(friend.FriendClient.GetPaginationFriendsApplyFrom, o.client, c)
+	a2r.Call(friend.FriendClient.GetPaginationFriendsApplyTo, o.client, c)
 }
 
 func (o *Friend) GetFriendList(c *gin.Context) {
diff --git a/pkg/rpcclient/convert/convert.go b/pkg/rpcclient/convert/convert.go
index 41c340a6b..737464aa4 100644
--- a/pkg/rpcclient/convert/convert.go
+++ b/pkg/rpcclient/convert/convert.go
@@ -40,7 +40,7 @@ func (*PBFriend) PB2DB(friends []*sdk.FriendInfo) (DBFriends []*relation.FriendM
 	return
 }
 
-func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel) (PBFriends []*sdk.FriendInfo, err error) {
+func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel) (pbFriends []*sdk.FriendInfo, err error) {
 	userIDs := utils2.Slice(friends, func(e *relation.FriendModel) string { return e.FriendUserID })
 	users, err := db.userCheck.GetUsersInfoMap(ctx, userIDs, true)
 	if err != nil {
@@ -52,6 +52,7 @@ func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel)
 		utils.CopyStructFields(pbfriend.FriendUser, users[v.FriendUserID])
 		pbfriend.CreateTime = v.CreateTime.Unix()
 		pbfriend.FriendUser.CreateTime = v.CreateTime.Unix()
+		pbFriends = append(pbFriends, pbfriend)
 	}
 	return
 }
@@ -131,6 +132,10 @@ func (db *DBFriendRequest) DB2PB(ctx context.Context, friendRequests []*relation
 		pbFriendRequest.CreateTime = v.CreateTime.Unix()
 		pbFriendRequest.HandleTime = v.HandleTime.Unix()
 		pbFriendRequest.HandlerUserID = v.HandlerUserID
+		pbFriendRequest.HandleResult = v.HandleResult
+		pbFriendRequest.Ex = v.Ex
+		pbFriendRequest.HandleMsg = v.HandleMsg
+		pbFriendRequest.ReqMsg = v.ReqMsg
 		PBFriendRequests = append(PBFriendRequests, pbFriendRequest)
 	}
 	return