Bug

app/operate/service/dto/org_team_team.go

@@ -7,11 +7,11 @@ import (
 
 type OrgTeamTeamGetPageReq struct {
 	dto.Pagination `search:"-"`
-	TeamId         string `form:"teamId"  search:"type:exact;column:team_id;table:ot" comment:""`
+	TeamId         string `form:"teamId"  search:"type:exact;column:team_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:""`
-	Rounds         string `form:"rounds"  search:"type:exact;column:rounds;table:om" comment:""`
+	Rounds         string `form:"rounds"  search:"type:exact;column:rounds;table:omtp" comment:""`
 }
 
 type OrgTeamTeamGetPageReply struct {

app/operate/service/org_match_evaluate.go

@@ -28,7 +28,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
 		"ome.remark"
 	err = e.Orm.Table("org_match_team_player as omtp").
 		Select(field).
-		Joins("left join org_match_evaluate as ome on omtp.match_id = ome.id and omtp.rounds = ome.rounds").
+		Joins("left join org_match_evaluate as ome on omtp.match_id = ome.id and omtp.rounds = ome.rounds and omtp.player_id = ome.player_id").
 		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
 		Joins("left join org_league as ol on ol.id = om.league_id").
 		Joins("left join org_division as od on od.id = om.division_id").
@@ -57,7 +57,7 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
 			"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"+
 			"ome.id as evaluate_id, omtp.player_id, om.season_id,"+
 			"ota.team_name as team_a_name, otb.team_name as team_b_name").
-		Joins("left join org_match_evaluate as ome on omtp.match_id = ome.match_id and omtp.rounds=ome.rounds").
+		Joins("left join org_match_evaluate as ome on omtp.match_id = ome.match_id and omtp.rounds=ome.rounds and omtp.player_id = ome.player_id").
 		Joins("left join org_club as oc on omtp.club_id = oc.id").
 		Joins("left join org_team as ot on omtp.team_id = ot.id").
 		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").

app/operate/service/org_team_match_evaluate.go

@@ -27,7 +27,7 @@ func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p
 		"ome.mv_status, ome.status, ome.remark"
 	err = e.Orm.Table("org_match_team_player as omtp").
 		Select(field).
-		Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
+		Joins("left join org_match_evaluate as ome on omtp.match_id = ome.match_id and omtp.rounds = ome.rounds and omtp.player_id = ome.player_id").
 		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
 		Joins("left join org_league as ol on ol.id = om.league_id").
 		Joins("left join org_division as od on od.id = om.division_id").

app/operate/service/org_team_team.go

@@ -22,7 +22,6 @@ type OrgTeamTeam struct {
 // GetPage 获取OrgMatch列表
 func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamTeamGetPageReply, count *int64) error {
 	var err error
-	var data models.OrgMatch
 
 	err = e.Orm.Table("org_match_team_player as omtp").
 		Select("omtp.team_id, ol.league_name, om.season_id, os.season_name, omtp.rounds,"+
@@ -34,7 +33,7 @@ func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermi
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
-			actions.Permission(data.TableName(), p),
+			actions.Permission("otmp", p),
 			cDto.PassDel("omtp"),
 		).
 		Where("omtp.team_id=?", c.TeamId).