fix(notify): distinct field of receivers

This commit is contained in:
rainzm
2021-06-24 10:39:15 +08:00
parent c22c9eb021
commit 1c865268f8
+5 -5
View File
@@ -723,14 +723,14 @@ func (rm *SReceiverManager) FetchCustomizeColumns(ctx context.Context, userCred
func (rm *SReceiverManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
q, err := rm.SStatusStandaloneResourceBaseManager.QueryDistinctExtraField(q, field)
if err != nil {
return nil, err
if err == nil {
return q, nil
}
q, err = rm.SDomainizedResourceBaseManager.QueryDistinctExtraField(q, field)
if err != nil {
return nil, err
if err == nil {
return q, nil
}
return q, nil
return q, httperrors.ErrNotFound
}
func (rm *SReceiverManager) OrderByExtraFields(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query api.ReceiverListInput) (*sqlchemy.SQuery, error) {