From 4546d9feac5ba23409b2b3958dfa01e94df901c9 Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Fri, 21 Jul 2023 14:08:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=88=86=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/model/group_m/groupTop.go |  7 +++++--
 route/group_r/group_list.go      | 18 +++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/domain/model/group_m/groupTop.go b/domain/model/group_m/groupTop.go
index 0429a81..fbb9cc1 100644
--- a/domain/model/group_m/groupTop.go
+++ b/domain/model/group_m/groupTop.go
@@ -23,9 +23,12 @@ func (g *GroupTop) Delete(model *domain.Model) error {
 	return model.Db.Where(g).Delete(&GroupTop{}).Error
 }
 
-func GroupTopGetAll(model *domain.Model) ([]string, error) {
+func GroupTopGetAll(model *domain.Model, area int) ([]string, error) {
 	rows := make([]GroupTop, 0)
-	err := model.Db.Order("id").Find(&rows).Error
+	err := model.DB().Table("group_top gt").
+		Joins("left join group_info gi on gt.im_group_id = gi.im_group_id left join res_country rc on gi.country = rc.name").
+		Where("rc.area = ?", area).
+		Order("id").Find(&rows).Error
 	if err != nil {
 		return nil, err
 	}
diff --git a/route/group_r/group_list.go b/route/group_r/group_list.go
index b8fafb3..e9d97f2 100644
--- a/route/group_r/group_list.go
+++ b/route/group_r/group_list.go
@@ -72,6 +72,12 @@ func GetPopularGroups(c *gin.Context) (*mycontext.MyContext, error) {
 	}
 
 	model := domain.CreateModelContext(myContext)
+	// 获取国家信息
+	_, area, err := user_m.GetUserCountryArea(model, myUserId)
+	if err != nil {
+		model.Log.Errorf("GetUserCountryArea 获取国家资源错误 userId:%d, err:%v", myUserId, err)
+		return myContext, err
+	}
 	/* 2022-06-30 老板说先不分区
 	regions, err := res_m.GetAllLangRegion(model)
 	if err != nil {
@@ -120,7 +126,7 @@ func GetPopularGroups(c *gin.Context) (*mycontext.MyContext, error) {
 	model.Log.Infof("GetPopularGroups, micGroupNum: %v, banned %d, hidden %d,cost:%v", micGroupNum, banCount, hiddenCount, time.Now().Sub(start))
 
 	// 3. 处理置顶群
-	topGroupIds, err := getTopGroups(model, bannedGroups, hiddenGroups)
+	topGroupIds, err := getTopGroups(model, bannedGroups, hiddenGroups, area)
 	if err != nil {
 		return myContext, err
 	}
@@ -165,12 +171,6 @@ func GetPopularGroups(c *gin.Context) (*mycontext.MyContext, error) {
 	//}
 	//logstr += " |"
 
-	// 获取国家信息
-	_, area, err := user_m.GetUserCountryArea(model, myUserId)
-	if err != nil {
-		model.Log.Errorf("GetUserCountryArea 获取国家资源错误 userId:%d, err:%v", myUserId, err)
-		return myContext, err
-	}
 	myArea := fmt.Sprintf("%d", area)
 	// 国家区域信息
 	resAreaMap, err := res_c.GetCountryAreaMap(model)
@@ -402,8 +402,8 @@ func GetPopularGroups(c *gin.Context) (*mycontext.MyContext, error) {
 	return myContext, nil
 }
 
-func getTopGroups(model *domain.Model, bannedGroups map[string]uint64, hiddenGroups map[string]struct{}) ([]string, error) {
-	topGroups, err := group_m.GroupTopGetAll(model)
+func getTopGroups(model *domain.Model, bannedGroups map[string]uint64, hiddenGroups map[string]struct{}, area int) ([]string, error) {
+	topGroups, err := group_m.GroupTopGetAll(model, area)
 	if err != nil {
 		return nil, err
 	}
-- 
2.22.0


From 74c1f6d36d076838ccee418c0521e7c5632a9e8c Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Fri, 21 Jul 2023 14:09:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=88=86=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/model/group_m/groupTop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain/model/group_m/groupTop.go b/domain/model/group_m/groupTop.go
index fbb9cc1..b0ec02d 100644
--- a/domain/model/group_m/groupTop.go
+++ b/domain/model/group_m/groupTop.go
@@ -28,7 +28,7 @@ func GroupTopGetAll(model *domain.Model, area int) ([]string, error) {
 	err := model.DB().Table("group_top gt").
 		Joins("left join group_info gi on gt.im_group_id = gi.im_group_id left join res_country rc on gi.country = rc.name").
 		Where("rc.area = ?", area).
-		Order("id").Find(&rows).Error
+		Order("gt.id").Find(&rows).Error
 	if err != nil {
 		return nil, err
 	}
-- 
2.22.0


From 51f731d7a30ad11ccc09cae07f1789a2544ff03a Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Fri, 21 Jul 2023 14:13:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=88=86=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/model/group_m/groupTop.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/domain/model/group_m/groupTop.go b/domain/model/group_m/groupTop.go
index b0ec02d..5cbf439 100644
--- a/domain/model/group_m/groupTop.go
+++ b/domain/model/group_m/groupTop.go
@@ -25,10 +25,11 @@ func (g *GroupTop) Delete(model *domain.Model) error {
 
 func GroupTopGetAll(model *domain.Model, area int) ([]string, error) {
 	rows := make([]GroupTop, 0)
-	err := model.DB().Table("group_top gt").
-		Joins("left join group_info gi on gt.im_group_id = gi.im_group_id left join res_country rc on gi.country = rc.name").
+	err := model.DB().Table("group_top").
+		Joins("left join group_info gi on group_top.im_group_id = gi.im_group_id "+
+			"left join res_country rc on gi.country = rc.name").
 		Where("rc.area = ?", area).
-		Order("gt.id").Find(&rows).Error
+		Order("group_top.id").Find(&rows).Error
 	if err != nil {
 		return nil, err
 	}
-- 
2.22.0