Club

app/operate/apis/org_player.go

@@ -24,6 +24,13 @@ func (e OrgPlayer) getTeamId(c *gin.Context) string {
 	return teamId
 }
 
+func (e OrgPlayer) 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 <球队>获取球员列表
@@ -53,6 +60,7 @@ func (e OrgPlayer) 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_player.go

@@ -11,6 +11,7 @@ import (
 
 type OrgPlayerGetPageReq struct {
 	dto.Pagination `search:"-"`
+	ClubId         string `form:"clubId"  search:"-"`
 	TeamId         string `form:"teamId"  search:"-"`
 	TeamName       string `form:"teamName"  search:"type:contains;column:team_name;table:ot" comment:""`
 	PlayerName     string `form:"playerName"  search:"type:contains;column:player_name;table:op" comment:""`

app/operate/service/org_player.go

@@ -22,7 +22,7 @@ func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermissio
 
 	err = e.Orm.Table("org_player as op").
 		Select("op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"+
-			"op.player_name,op.player_number,op.position,op.sex,op.status").
+			"op.player_name,op.player_name_en,op.player_number,op.position,op.sex,op.status").
 		Joins("left join org_club as oc on op.club_id=oc.id").
 		Joins("left join org_team as ot on op.team_id=ot.id").
 		Joins("left join org_player_user as opu on op.player_user_id=opu.id").
@@ -31,6 +31,7 @@ func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermissio
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
 			cDto.SetWhere("op", "team_id", c.TeamId),
+			cDto.SetWhere("op", "club_id", c.ClubId),
 			cDto.PassDel("op"),
 		).
 		Find(list).Limit(-1).Offset(-1).