From d2a7e9d8d541d47cab5be9529ad6a974f0044817 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 29 Nov 2024 15:52:11 +0800
Subject: [PATCH] 1

---
 server/wheelserver/service/friend.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/wheelserver/service/friend.go b/server/wheelserver/service/friend.go
index 950ec05f..4b9c9be4 100644
--- a/server/wheelserver/service/friend.go
+++ b/server/wheelserver/service/friend.go
@@ -1,8 +1,10 @@
 package service
 
 import (
+	"q5"
 	"f5"
 	"main/model"
+	"main/vo"
 	"main/constant"
 )
 
@@ -16,9 +18,15 @@ func (this *friend) init() {
 func (this *friend) unInit() {
 }
 
-func (this *friend) List(accountId string) (error, []*model.User) {
-	friends := []*model.Friend{}
-	result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(new(model.Friend).TableName()).Where(
-		"account_id = ? AND item_num > ?", accountId, 0).Find(&friends)
-	return result.Error, friends
+func (this *friend) List(accountId string) (error, []*vo.Friend) {
+	friends := []*model.User{}
+	result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(new(model.User).TableName()).Where(
+		"invited = ?", accountId).Find(&friends)
+	friendsVo := []*vo.Friend{}
+	for _, u := range(friends) {
+		friendVo := new(vo.Friend)
+		friendVo.FromModel(u)
+		q5.AppendSlice(&friendsVo, friendVo)
+	}
+	return result.Error, friendsVo
 }