Skip templates with empty tenant filter groups

JohnDuprey · JohnDuprey · commit a02c796f25ea · 2026-01-02T13:37:52.000-05:00
Templates with tenant filters that resolve to no tenants (empty groups) are now skipped instead of being assigned an empty tenant list. This prevents unnecessary processing of templates that do not apply to any tenants.
diff --git a/Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1 b/Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1
@@ -125,13 +125,14 @@ function Get-CIPPTenantAlignment {
                         $TenantValues.Add($filterItem.value)
                     }
                 }
-
-                if ($TenantValues -contains 'AllTenants') {
+`
+                    if ($TenantValues -contains 'AllTenants') {
                     $AppliestoAllTenants = $true
                 } elseif ($TenantValues.Count -gt 0) {
                     $TemplateAssignedTenants = @($TenantValues)
                 } else {
-                    $TemplateAssignedTenants = @()
+                    # Filter was specified but resolved to no tenants (empty group) - skip this template
+                    continue
                 }
             } else {
                 $AppliestoAllTenants = $true

Original file line number	Diff line number	Diff line change
`@@ -125,13 +125,14 @@ function Get-CIPPTenantAlignment {`
`125`	`125`	`$TenantValues.Add($filterItem.value)`
`126`	`126`	`}`
`127`	`127`	`}`
`128`		`-`
`129`		`- if ($TenantValues -contains 'AllTenants') {`
	`128`	+`
	`129`	`+ if ($TenantValues -contains 'AllTenants') {`
`130`	`130`	`$AppliestoAllTenants = $true`
`131`	`131`	`} elseif ($TenantValues.Count -gt 0) {`
`132`	`132`	`$TemplateAssignedTenants = @($TenantValues)`
`133`	`133`	`} else {`
`134`		`- $TemplateAssignedTenants = @()`
	`134`	`+ # Filter was specified but resolved to no tenants (empty group) - skip this template`
	`135`	`+ continue`
`135`	`136`	`}`
`136`	`137`	`} else {`
`137`	`138`	`$AppliestoAllTenants = $true`