1

app/operate/apis/org_player.go

@@ -17,6 +17,13 @@ type OrgPlayer struct {
 	api.Api
 }
 
+func (e OrgPlayer) 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 +52,8 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
 	list := make([]dto.OrgPlayerGetPageReply, 0)
 	var count int64
 
+	req.TeamId = e.getTeamId(c)
+
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))

app/operate/apis/org_team_match_evaluate.go

@@ -191,11 +191,25 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
 		return
 	}
 
-	err = s.Update(&req, p)
-
+	err, playerId := s.IsBeing(req.MatchId, req.Rounds, req.PlayerId)
+	eId := 0
+	if playerId == 0 {
+		reqInsertData := dto.OrgMatchEvaluateInsertReq{
+			MatchId:       req.MatchId,
+			Rounds:        req.Rounds,
+			PlayerId:      req.PlayerId,
+			Content:       req.Content,
+			ContentStatus: req.ContentStatus,
+		}
+		err, eId = s.Insert(&reqInsertData)
+	} else {
+		err, eId = s.Update(&req, p)
+	}
+	fmt.Println(eId)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("修改比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
+
 	e.OK(req.GetId(), "修改成功")
 }

app/operate/apis/org_team_player.go

@@ -19,6 +19,13 @@ type OrgTeamPlayer struct {
 	api.Api
 }
 
+func (e OrgTeamPlayer) 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,13 +52,9 @@ func (e OrgTeamPlayer) GetPage(c *gin.Context) {
 
 	p := actions.GetPermissionFromContext(c)
 
-	sOrgTeamUser := service.OrgTeamUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
-	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
-
 	list := make([]dto.OrgTeamPlayerGetPageReply, 0)
 	var count int64
-	req.TeamId = teamId
+	req.TeamId = e.getTeamId(c)
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {

app/operate/service/org_team_match_evaluate.go

@@ -21,8 +21,12 @@ type OrgTeamMatchEvaluate struct {
 func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamMatchEvaluateGetPageReply, count *int64) error {
 	var err error
 
+	field := "omtp.id, ol.league_name, od.division_name, os.season_name, om.rounds," +
+		"omtp.player_name, om.match_start_time, om.match_end_time, " +
+		"IF(ome.content_status='' or ome.content_status is null,1,ome.content_status)as content_status," +
+		"ome.mv_status, ome.status, ome.remark"
 	err = e.Orm.Table("org_match_team_player as omtp").
-		Select("omtp.id, ol.league_name, od.division_name, os.season_name, om.rounds, omtp.player_name, om.match_start_time, om.match_end_time, ome.mv_status, ome.status, ome.remark").
+		Select(field).
 		Joins("left join org_match_evaluate as ome on 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").
@@ -34,6 +38,7 @@ func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p
 			actions.Permission("omtp", p),
 			cDto.PassDel("omtp"),
 		).
+		Where("om.status=?", 3).
 		Where("omtp.team_id=?", c.TeamId).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
@@ -322,20 +327,20 @@ func (e *OrgTeamMatchEvaluate) Get(d *dto.OrgMatchEvaluateGetReq, p *actions.Dat
 }
 
 // Insert 创建OrgMatchEvaluate对象
-func (e *OrgTeamMatchEvaluate) Insert(c *dto.OrgMatchEvaluateInsertReq) error {
+func (e *OrgTeamMatchEvaluate) Insert(c *dto.OrgMatchEvaluateInsertReq) (error, int) {
 	var err error
 	var data models.OrgMatchEvaluate
 	c.Generate(&data)
 	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("OrgMatchEvaluateService Insert error:%s \r\n", err)
-		return err
+		return err, 0
 	}
-	return nil
+	return nil, data.Id
 }
 
 // Update 修改OrgMatchEvaluate对象
-func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgTeamMatchEvaluateUpdateReq, p *actions.DataPermission) error {
+func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgTeamMatchEvaluateUpdateReq, p *actions.DataPermission) (error, int) {
 	var err error
 	var data = models.OrgMatchEvaluate{}
 	e.Orm.Scopes(
@@ -345,6 +350,8 @@ func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgTeamMatchEvaluateUpdateReq, p *a
 		Where("rounds = ?", c.Rounds).
 		Where("player_id = ?", c.PlayerId).
 		First(&data)
+
+	id := data.Id
 	c.Generate(&data)
 
 	db := e.Orm.Scopes(
@@ -356,12 +363,12 @@ func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgTeamMatchEvaluateUpdateReq, p *a
 		Updates(&data)
 	if db.Error != nil {
 		e.Log.Errorf("OrgMatchEvaluateService Save error:%s \r\n", err)
-		return err
+		return err, 0
 	}
 	if db.RowsAffected == 0 {
-		return errors.New("无权更新该数据")
+		return errors.New("无权更新该数据"), 0
 	}
-	return nil
+	return nil, id
 }
 
 // Remove 删除OrgMatchEvaluate

app/operate/service/org_team_player.go

@@ -33,7 +33,7 @@ func (e *OrgTeamPlayer) GetPage(c *dto.OrgTeamPlayerGetPageReq, p *actions.DataP
 			actions.Permission("omtp", p),
 			cDto.PassDel("omtp"),
 		).
-		//Where("omtp.team_id=?", c.TeamId).
+		Where("omtp.team_id=?", c.TeamId).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {

app/operate/service/org_team_user.go

@@ -138,7 +138,7 @@ func (e *OrgTeamUser) GetUserIds(ids []int) (error, []int) {
 	return nil, userIds
 }
 
-// Get 获取OrgClubUser对象
+// 根据teamId获取userId
 func (e *OrgTeamUser) GetClubId(teamId string) (error, string) {
 	data := new(models.OrgTeam)
 
@@ -153,7 +153,7 @@ func (e *OrgTeamUser) GetClubId(teamId string) (error, string) {
 	return nil, data.ClubId
 }
 
-// Get 获取OrgClubUser对象
+// 根据userId获取teamId
 func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
 	data := new(models.OrgTeamUser)
 
@@ -168,7 +168,7 @@ func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
 	return nil, data.TeamId
 }
 
-// Get 获取OrgClubUser对象
+// 根据工作人员id获取userId
 func (e *OrgTeamUser) GetUserId(teamUserId int) (error, string) {
 	data := new(models.OrgTeamUser)
 

common/middleware/data.go

+package middleware