IntenseFinance/zitadel
3
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Merge branch 'main' into permitted-org-function-sql

Browse Source
This commit is contained in:
Iraq Jaber 2025-02-14 12:09:10 +00:00
parent f0f2cf7739
commit 27b67030c1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/user/v2/query.go
View File

@ -216,7 +216,7 @@ func userFieldNameToSortingColumn(field user.UserFieldName) query.Column {
func userQueriesToQuery(queries []*user.SearchQuery, level uint8) (_ []query.SearchQuery, filterOrgId string, err error) {
q := make([]query.SearchQuery, len(queries))
for i, query := range queries {
if orgFilter := query.GetOrganizationIdQuery(); orgFilter.OrganizationId != "" {
if orgFilter := query.GetOrganizationIdQuery(); orgFilter != nil {
filterOrgId = orgFilter.OrganizationId
}
q[i], err = userQueryToQuery(query, level)

2
internal/api/grpc/user/v2beta/query.go
View File

@ -212,7 +212,7 @@ func userFieldNameToSortingColumn(field user.UserFieldName) query.Column {
func userQueriesToQuery(queries []*user.SearchQuery, level uint8) (_ []query.SearchQuery, filterOrgId string, err error) {
q := make([]query.SearchQuery, len(queries))
for i, query := range queries {
if orgFilter := query.GetOrganizationIdQuery(); orgFilter.OrganizationId != "" {
if orgFilter := query.GetOrganizationIdQuery(); orgFilter != nil {
filterOrgId = orgFilter.OrganizationId
}
q[i], err = userQueryToQuery(query, level)