fix group team unit query

GamerGirlandCo · GamerGirlandCo · commit 1277084ea7ae · 2025-12-02T18:26:35.000-05:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type RepoGroupTeam struct {`
`26`	`26`
`27`	`27`	`func (g *RepoGroupTeam) LoadGroupUnits(ctx context.Context) error {`
`28`	`28`	`var err error`
`29`		`- g.Units, err = GetUnitsByGroupID(ctx, g.GroupID)`
	`29`	`+ g.Units, err = GetUnitsByGroupID(ctx, g.GroupID, g.TeamID)`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ func (g *RepoGroupUnit) Unit() unit.Unit {`
`24`	`24`	`return unit.Units[g.Type]`
`25`	`25`	`}`
`26`	`26`
`27`		`-func GetUnitsByGroupID(ctx context.Context, groupID int64) (units []*RepoGroupUnit, err error) {`
`28`		`- return units, db.GetEngine(ctx).Where("group_id = ?", groupID).Find(&units)`
	`27`	`+func GetUnitsByGroupID(ctx context.Context, groupID, teamID int64) (units []*RepoGroupUnit, err error) {`
	`28`	`+ return units, db.GetEngine(ctx).Where("group_id = ?", groupID).And("team_id = ?", teamID).Find(&units)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func GetGroupUnit(ctx context.Context, groupID, teamID int64, unitType unit.Type) (unit *RepoGroupUnit, err error) {`