diff --git a/models/group/group_team.go b/models/group/group_team.go index 1e9804f2cb..87def2efcd 100644 --- a/models/group/group_team.go +++ b/models/group/group_team.go @@ -26,7 +26,7 @@ type RepoGroupTeam struct { func (g *RepoGroupTeam) LoadGroupUnits(ctx context.Context) error { var err error - g.Units, err = GetUnitsByGroupID(ctx, g.GroupID) + g.Units, err = GetUnitsByGroupID(ctx, g.GroupID, g.TeamID) return err } diff --git a/models/group/group_unit.go b/models/group/group_unit.go index 716770f85e..f7a484d6e7 100644 --- a/models/group/group_unit.go +++ b/models/group/group_unit.go @@ -24,8 +24,8 @@ func (g *RepoGroupUnit) Unit() unit.Unit { return unit.Units[g.Type] } -func GetUnitsByGroupID(ctx context.Context, groupID int64) (units []*RepoGroupUnit, err error) { - return units, db.GetEngine(ctx).Where("group_id = ?", groupID).Find(&units) +func GetUnitsByGroupID(ctx context.Context, groupID, teamID int64) (units []*RepoGroupUnit, err error) { + return units, db.GetEngine(ctx).Where("group_id = ?", groupID).And("team_id = ?", teamID).Find(&units) } func GetGroupUnit(ctx context.Context, groupID, teamID int64, unitType unit.Type) (unit *RepoGroupUnit, err error) {