@@ -110,26 +110,28 @@ func GetRepoAssignees(ctx context.Context, repo *Repository) (_ []*user_model.Us
110
110
return nil , err
111
111
}
112
112
113
- additionalUserIDs := make ([]int64 , 0 , 10 )
114
- if err = e .Table ("team_user" ).
115
- Join ("INNER" , "team_repo" , "`team_repo`.team_id = `team_user`.team_id" ).
116
- Join ("INNER" , "team_unit" , "`team_unit`.team_id = `team_user`.team_id" ).
117
- Where ("`team_repo`.repo_id = ? AND (`team_unit`.access_mode >= ? OR (`team_unit`.access_mode = ? AND `team_unit`.`type` = ?))" ,
118
- repo .ID , perm .AccessModeWrite , perm .AccessModeRead , unit .TypePullRequests ).
119
- Distinct ("`team_user`.uid" ).
120
- Select ("`team_user`.uid" ).
121
- Find (& additionalUserIDs ); err != nil {
122
- return nil , err
123
- }
124
-
125
113
uniqueUserIDs := make (container.Set [int64 ])
126
114
uniqueUserIDs .AddMultiple (userIDs ... )
127
- uniqueUserIDs .AddMultiple (additionalUserIDs ... )
115
+
116
+ if repo .Owner .IsOrganization () {
117
+ additionalUserIDs := make ([]int64 , 0 , 10 )
118
+ if err = e .Table ("team_user" ).
119
+ Join ("INNER" , "team_repo" , "`team_repo`.team_id = `team_user`.team_id" ).
120
+ Join ("INNER" , "team_unit" , "`team_unit`.team_id = `team_user`.team_id" ).
121
+ Where ("`team_repo`.repo_id = ? AND (`team_unit`.access_mode >= ? OR (`team_unit`.access_mode = ? AND `team_unit`.`type` = ?))" ,
122
+ repo .ID , perm .AccessModeWrite , perm .AccessModeRead , unit .TypePullRequests ).
123
+ Distinct ("`team_user`.uid" ).
124
+ Select ("`team_user`.uid" ).
125
+ Find (& additionalUserIDs ); err != nil {
126
+ return nil , err
127
+ }
128
+ uniqueUserIDs .AddMultiple (additionalUserIDs ... )
129
+ }
128
130
129
131
// Leave a seat for owner itself to append later, but if owner is an organization
130
132
// and just waste 1 unit is cheaper than re-allocate memory once.
131
133
users := make ([]* user_model.User , 0 , len (uniqueUserIDs )+ 1 )
132
- if len (userIDs ) > 0 {
134
+ if len (uniqueUserIDs ) > 0 {
133
135
if err = e .In ("id" , uniqueUserIDs .Values ()).
134
136
Where (builder.Eq {"`user`.is_active" : true }).
135
137
OrderBy (user_model .GetOrderByName ()).
0 commit comments