req.ClubId = e.getClubId(c)

app/operate/apis/org_team_club.go

@@ -41,11 +41,9 @@ func (e OrgTeamClub) Get(c *gin.Context) {
 		return
 	}
 
-	sOrgTeamUser := service.OrgTeamUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
-	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
-
-	_, clubId := sOrgTeamUser.GetClubId(teamId)
+	sOrgClubUser := service.OrgClubUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
+	_, clubId := sOrgClubUser.GetClubId(user.GetUserId(c))
 
 	var object models.OrgClub
 

app/operate/apis/org_team_player.go

@@ -26,6 +26,13 @@ func (e OrgTeamPlayer) getTeamId(c *gin.Context) string {
 	return teamId
 }
 
+func (e OrgTeamPlayer) 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 OrgTeamPlayer) GetPage(c *gin.Context) {
 	list := make([]dto.OrgTeamPlayerGetPageReply, 0)
 	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/apis/org_team_team.go

@@ -26,6 +26,13 @@ func (e OrgTeamTeam) getTeamId(c *gin.Context) string {
 	return teamId
 }
 
+func (e OrgTeamTeam) 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 <球队>获取球队表现列表
@@ -54,6 +61,7 @@ func (e OrgTeamTeam) GetPage(c *gin.Context) {
 	list := make([]dto.OrgTeamTeamGetPageReply, 0)
 	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_player.go

@@ -6,7 +6,8 @@ import (
 
 type OrgTeamPlayerGetPageReq struct {
 	dto.Pagination `search:"-"`
-	TeamId         string `form:"reamId"  search:"-"`                                                              //联赛级别id
+	TeamId         string `form:"teamId"  search:"-"`                                                              //联赛级别id
+	ClubId         string `form:"clubId"  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
 	SeasonId       string `form:"seasonId"  search:"type:exact;column:season_id;table:om" comment:"赛季id"`          //赛季id

app/operate/service/dto/org_team_team.go

@@ -8,6 +8,7 @@ import (
 type OrgTeamTeamGetPageReq struct {
 	dto.Pagination `search:"-"`
 	TeamId         string `form:"teamId"  search:"type:exact;column:team_id;table:omtp" comment:""`
+	ClubId         string `form:"clubId"  search:"type:exact;column:club_id;table:omtp" comment:""`
 	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:""`
 	DivisionId     string `form:"divisionId"  search:"type:exact;column:division_id;table:om" comment:""`
 	SeasonId       string `form:"seasonId"  search:"type:exact;column:season_id;table:om" comment:""`

app/operate/service/org_team_player.go

@@ -32,8 +32,9 @@ func (e *OrgTeamPlayer) GetPage(c *dto.OrgTeamPlayerGetPageReq, p *actions.DataP
 			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("omtp.team_id=?", c.TeamId).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {

app/operate/service/org_team_team.go

@@ -35,8 +35,9 @@ func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermi
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission("otmp", p),
 			cDto.PassDel("omtp"),
+			cDto.SetWhere("omtp", "team_id", c.TeamId),
+			cDto.SetWhere("omtp", "club_id", c.ClubId),
 		).
-		Where("omtp.team_id=?", c.TeamId).
 		Group("omtp.match_id").
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
@@ -89,8 +90,8 @@ func (e *OrgTeamTeam) GetMatchInfo(id string, p *actions.DataPermission, data *c
 		Joins("left join org_season as os on os.id = om.season_id").
 		Scopes(
 			actions.Permission("omtp", p),
+			cDto.SetWhere("omtp", "team_id", id),
 		).
-		Where("omtp.team_id=?", id).
 		First(data).Error
 	if err != nil {
 		e.Log.Errorf("OrgMatchService GetMatchInfo error:%s \r\n", err)