1

app/operate/apis/org_team_match_evaluate.go

@@ -27,6 +27,13 @@ func (e OrgTeamMatchEvaluate) getTeamId(c *gin.Context) string {
 	return teamId
 }
 
+func (e OrgTeamMatchEvaluate) getClubId(c *gin.Context) string {
+	sOrgTeamUser := service.OrgClubUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetClubId(user.GetUserId(c))
+	return teamId
+}
+
 // GetPage <球队>教练评价列表
 // @Summary <球队>教练评价列表
 // @Description <球队>教练评价列表
@@ -55,6 +62,7 @@ func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
 	var count int64
 
 	req.TeamId = e.getTeamId(c)
+	req.ClubId = e.getClubId(c)
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {

app/operate/service/dto/org_team_match_evaluate.go

@@ -9,6 +9,7 @@ import (
 
 type OrgTeamMatchEvaluateGetPageReq struct {
 	dto.Pagination `search:"-"`
+	ClubId         string `form:"clubId"  search:"-"`                                                                                 //联赛级别id
 	TeamId         string `form:"teamId"  search:"-"`                                                                                 //联赛级别id
 	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:"联赛级别id"`                           //联赛级别id
 	DivisionId     string `form:"divisionId"  search:"type:exact;column:division_id;table:om" comment:"赛区id"`                         //赛区id

app/operate/service/org_team_match_evaluate.go

@@ -37,9 +37,10 @@ func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission("omtp", p),
 			cDto.PassDel("omtp"),
+			cDto.SetWhere("omtp", "team_id", c.TeamId),
+			cDto.SetWhere("omtp", "club_id", c.ClubId),
 		).
 		Where("om.status=?", 3).
-		Where("omtp.team_id=?", c.TeamId).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {