1

app/operate/apis/org_team_match.go

@@ -20,7 +20,7 @@ type OrgTeamMatch struct {
 	api.Api
 }
 
-func (e OrgTeamMatch) getTeamIds(c *gin.Context, clubId string) string {
+func (e OrgTeamMatch) getTeamIds(c *gin.Context, clubId string) []int {
 	sOrgTeam := service.OrgTeam{}
 	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service)
 	_, teamId := sOrgTeam.GetTeamIds(clubId)
@@ -77,7 +77,7 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 			return
 		}
 		req.TeamIds = e.getTeamIds(c, req.ClubId)
-		if req.TeamIds == "" {
+		if len(req.TeamIds) == 0 {
 			e.Error(111, err, "数据有误")
 			return
 		}
@@ -90,12 +90,24 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 	}
 
 	for k, v := range list {
-		if v.TeamAId == req.TeamId {
-			list[k].OwnTeam = "a"
-		}
-		if v.TeamBId == req.TeamId {
-			list[k].OwnTeam = "b"
+		if req.TeamId != "" {
+			if v.TeamAId == req.TeamId {
+				list[k].OwnTeam = "a"
+			}
+			if v.TeamBId == req.TeamId {
+				list[k].OwnTeam = "b"
+			}
+		} else {
+			for _, val := range req.TeamIds {
+				if v.TeamAId == strconv.Itoa(val) {
+					list[k].OwnTeam = "a"
+				}
+				if v.TeamBId == strconv.Itoa(val) {
+					list[k].OwnTeam = "b"
+				}
+			}
 		}
+
 	}
 
 	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")

app/operate/apis/org_team_user.go

@@ -20,10 +20,10 @@ type OrgTeamUser struct {
 	api.Api
 }
 
-func (e OrgTeamUser) getTeamIds(c *gin.Context, clubId string) string {
-	sOrgTeam := service.OrgTeam{}
-	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service)
-	_, teamId := sOrgTeam.GetTeamIds(clubId)
+func (e OrgTeamUser) getTeamId(c *gin.Context) string {
+	sOrgTeamUser := service.OrgTeamUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
 	return teamId
 }
 

app/operate/service/dto/org_team_match.go

@@ -9,7 +9,7 @@ import (
 type OrgTeamMatchGetPageReq struct {
 	dto.Pagination `search:"-"`
 	ClubId         string `form:"clubId" search:"-"`
-	TeamIds        string `form:"teamIds" search:"-"`
+	TeamIds        []int  `form:"teamIds" search:"-"`
 	TeamId         string `form:"teamId" search:"-"`
 	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:""`

app/operate/service/org_team.go

@@ -2,9 +2,6 @@ package service
 
 import (
 	"errors"
-	"strconv"
-	"strings"
-
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
@@ -163,7 +160,7 @@ func (e *OrgTeam) InsertTeamDept(teamId int, deptId int) error {
 }
 
 // 根据userId获取teamId
-func (e *OrgTeam) GetTeamIds(clubId string) (error, string) {
+func (e *OrgTeam) GetTeamIds(clubId string) (error, []int) {
 	data := make([]models.OrgTeam, 0)
 
 	err := e.Orm.Table("org_team").
@@ -172,12 +169,11 @@ func (e *OrgTeam) GetTeamIds(clubId string) (error, string) {
 		Find(&data).Error
 	if err != nil {
 		e.Log.Errorf("db error:%s", err)
-		return err, ""
+		return err, nil
 	}
-	teamIds := ""
+	teamIds := make([]int, 0)
 	for _, v := range data {
-		teamIds += strconv.Itoa(v.Id) + ","
+		teamIds = append(teamIds, v.Id)
 	}
-	teamIds = strings.Trim(teamIds, ",")
 	return nil, teamIds
 }

common/dto/match.go

@@ -107,9 +107,9 @@ func SetWhereNotIn(tableName string, fieldName string, fieldValue string) func(d
 	}
 }
 
-func SetWhereForMatch(teamId string, teamIds string) func(db *gorm.DB) *gorm.DB {
+func SetWhereForMatch(teamId string, teamIds []int) func(db *gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {
-		if teamIds == "" && teamId == "" {
+		if len(teamIds) == 0 && teamId == "" {
 			return db
 		}
 		if teamId == "" {