1

app/operate/apis/org_team_match.go

@@ -20,6 +20,13 @@ type OrgTeamMatch struct {
 	api.Api
 }
 
+func (e OrgTeamMatch) getTeamId(c *gin.Context) string {
+	sOrgTeamUser := service.OrgTeamUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
+	return teamId
+}
+
 // GetPage <球队>获取比赛列表
 // @Summary <球队>获取比赛列表
 // @Description <球队>获取比赛列表
@@ -44,20 +51,11 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 		return
 	}
 
-	sOrgTeamUser := service.OrgTeamUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
-	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
-
-	if teamId == "" {
-		e.Logger.Error(err)
-		e.Error(500, err, "用户无权限")
-		return
-	}
 	p := actions.GetPermissionFromContext(c)
 	list := make([]dto.OrgTeamMatchGetPageReply, 0)
 	var count int64
 
-	req.TeamId = teamId
+	req.TeamId = e.getTeamId(c)
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
@@ -66,10 +64,10 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 	}
 
 	for k, v := range list {
-		if v.TeamAId == teamId {
+		if v.TeamAId == req.TeamId {
 			list[k].OwnTeam = "a"
 		}
-		if v.TeamBId == teamId {
+		if v.TeamBId == req.TeamId {
 			list[k].OwnTeam = "b"
 		}
 	}

app/operate/apis/org_team_match_evaluate.go

@@ -19,6 +19,13 @@ type OrgTeamMatchEvaluate struct {
 	api.Api
 }
 
+func (e OrgTeamMatchEvaluate) getTeamId(c *gin.Context) string {
+	sOrgTeamUser := service.OrgTeamUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
+	return teamId
+}
+
 // GetPage <球队>教练评价列表
 // @Summary <球队>教练评价列表
 // @Description <球队>教练评价列表
@@ -46,11 +53,7 @@ func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
 	list := make([]dto.OrgTeamMatchEvaluateGetPageReply, 0)
 	var count int64
 
-	sOrgTeamUser := service.OrgTeamUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
-	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
-
-	req.TeamId = teamId
+	req.TeamId = e.getTeamId(c)
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {

app/operate/apis/org_team_team.go

@@ -2,6 +2,7 @@ package apis
 
 import (
 	"fmt"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	cDto "go-admin/common/dto"
 	"strconv"
 
@@ -18,6 +19,13 @@ type OrgTeamTeam struct {
 	api.Api
 }
 
+func (e OrgTeamTeam) getTeamId(c *gin.Context) string {
+	sOrgTeamUser := service.OrgTeamUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
+	return teamId
+}
+
 // GetPage <球队>获取球队表现列表
 // @Summary <球队>获取球队表现列表
 // @Description <球队>获取球队表现列表
@@ -45,6 +53,7 @@ func (e OrgTeamTeam) GetPage(c *gin.Context) {
 	p := actions.GetPermissionFromContext(c)
 	list := make([]dto.OrgTeamTeamGetPageReply, 0)
 	var count int64
+	req.TeamId = e.getTeamId(c)
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
@@ -93,7 +102,7 @@ func (e OrgTeamTeam) GetPageMatch(c *gin.Context) {
 	reply.MatchInfo = *replyGetMatchInfo
 
 	replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
-	err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, &replyGetRoundsScoring)
+	err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.MatchId, &replyGetRoundsScoring)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
 		return

app/operate/service/org_team_team.go

@@ -37,7 +37,8 @@ func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermi
 			actions.Permission(data.TableName(), p),
 			cDto.PassDel("omtp"),
 		).
-		Group("omtp.team_id").
+		Where("omtp.team_id=?", c.TeamId).
+		Group("omtp.match_id").
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
@@ -65,7 +66,7 @@ func (e *OrgTeamTeam) GetPageForTeam(seasonId string) (error, []models.OrgMatchT
 			"sum(omtp.three_point_shot)as three_point_shot").
 		Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
 		Scopes(cDto.SetWhere("om", "season_id", seasonId)).
-		Group("omtp.team_id").
+		Group("omtp.match_id").
 		Find(list).Count(&count).Error
 
 	if err != nil {
@@ -99,7 +100,7 @@ func (e *OrgTeamTeam) GetMatchInfo(id string, p *actions.DataPermission, data *c
 	return nil
 }
 
-func (e *OrgTeamTeam) GetRoundsScoring(teamId string, rounds string, data *[]cDto.RoundsScoring) error {
+func (e *OrgTeamTeam) GetRoundsScoring(teamId string, matchId string, data *[]cDto.RoundsScoring) error {
 	var err error
 
 	err = e.Orm.Table("org_match_team_player as omtp").
@@ -117,9 +118,9 @@ func (e *OrgTeamTeam) GetRoundsScoring(teamId string, rounds string, data *[]cDt
 		Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
 		Scopes(
 			cDto.SetWhere("omtp", "team_id", teamId),
-			cDto.SetWhere("omtp", "rounds", rounds),
+			cDto.SetWhere("omtp", "match_id", matchId),
 		).
-		Group("omtp.rounds").
+		Group("omtp.match_id").
 		Find(data).Error
 	if err != nil {
 		e.Log.Errorf("OrgMatchService GetRoundsScoring error:%s \r\n", err)