1

app/operate/apis/org_match.go

@@ -141,6 +141,11 @@ func (e OrgMatch) GetInfo(c *gin.Context) {
 		return
 	}
 
+	//获取clubId
+	sOrgClubUser := service.OrgClubUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
+	_, clubId := sOrgClubUser.GetClubId(user.GetUserId(c))
+
 	//球队列表
 	sOrgTeam := service.OrgTeam{}
 	listOrgTeam := make([]dto.OrgTeamGetPageReply, 0)
@@ -151,6 +156,7 @@ func (e OrgMatch) GetInfo(c *gin.Context) {
 	reqOrgTeam := new(dto.OrgTeamGetPageReq)
 	reqOrgTeam.PageIndex = 1
 	reqOrgTeam.PageSize = 999
+	reqOrgTeam.ClubId = clubId
 
 	err = sOrgTeam.GetPage(reqOrgTeam, p, &listOrgTeam, &countOrgTeam)
 
@@ -159,10 +165,7 @@ func (e OrgMatch) GetInfo(c *gin.Context) {
 		return
 	}
 
-	sOrgClubUser := service.OrgClubUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
-	_, clubId := sOrgClubUser.GetClubId(user.GetUserId(c))
-
+	//俱乐部信息
 	sOrgClub := service.OrgClub{}
 	var objectOrgClub models.OrgClub