From d96a09ac44db06c48089fc62aedf0b15fc9fc954 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 2 Sep 2026 15:58:03 +0800 Subject: [PATCH] fix(cloudcommon): fix err shadowing in GetPropertyDistinctField (#25470) --- pkg/cloudcommon/db/modelbase.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/modelbase.go b/pkg/cloudcommon/db/modelbase.go index e356158d66..7fa2a758d8 100644 --- a/pkg/cloudcommon/db/modelbase.go +++ b/pkg/cloudcommon/db/modelbase.go @@ -412,19 +412,17 @@ func (manager *SModelBaseManager) GetPropertyDistinctField(ctx context.Context, if !ok { im = manager } - fn, err := query.GetArray("field") - if err != nil { - return nil, httperrors.NewInputParameterError("missing field") - } + fn, _ := query.GetArray("field") efs, _ := query.GetArray("extra_field") fields := make([]string, len(fn)) // validate field for i, f := range fn { - fields[i], err = f.GetString() + fs, err := f.GetString() if err != nil { return nil, httperrors.NewInputParameterError("can't get string field") } + fields[i] = fs var hasField = false for _, field := range manager.getTable().Fields() { if field.Name() == fields[i] { @@ -438,7 +436,7 @@ func (manager *SModelBaseManager) GetPropertyDistinctField(ctx context.Context, } q := im.Query() - q, err = ListItemQueryFilters(im, ctx, q, userCred, query, policy.PolicyActionList) + q, err := ListItemQueryFilters(im, ctx, q, userCred, query, policy.PolicyActionList) if err != nil { return nil, err }