Merge pull request KelvinTegelaar#1635 from PeterVive/intune-comparison-nullvalues

KelvinTegelaar · web-flow · commit 6150e2030df6 · 2025-09-28T22:21:44.000+02:00
Add proper null checks to handle "0" values not being evaluated as false.
diff --git a/Modules/CIPPCore/Public/Compare-CIPPIntuneObject.ps1 b/Modules/CIPPCore/Public/Compare-CIPPIntuneObject.ps1
@@ -244,6 +244,9 @@ function Compare-CIPPIntuneObject {
                                             $child.choiceSettingValue.value
                                         }
                                     }
+                                    if (!$childValue -and $null -ne $child.simpleSettingValue -and $null -ne $child.simpleSettingValue.value) {
+                                        $childValue = $child.simpleSettingValue.value
+                                    }
 
                                     # Add object to our temporary list
                                     [PSCustomObject]@{
@@ -337,9 +340,9 @@ function Compare-CIPPIntuneObject {
                                         } else {
                                             $child.choiceSettingValue.value
                                         }
-                                        if (!$childValue -and $child.simpleSettingValue.value) {
-                                            $childValue = $child.simpleSettingValue.value
-                                        }
+                                    }
+                                    if (!$childValue -and $null -ne $child.simpleSettingValue -and $null -ne $child.simpleSettingValue.value) {
+                                        $childValue = $child.simpleSettingValue.value
                                     }
 
                                     # Add object to our temporary list

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,9 @@ function Compare-CIPPIntuneObject {`
`244`	`244`	`$child.choiceSettingValue.value`
`245`	`245`	`}`
`246`	`246`	`}`
	`247`	`+ if (!$childValue -and $null -ne $child.simpleSettingValue -and $null -ne $child.simpleSettingValue.value) {`
	`248`	`+ $childValue = $child.simpleSettingValue.value`
	`249`	`+ }`
`247`	`250`
`248`	`251`	`# Add object to our temporary list`
`249`	`252`	`[PSCustomObject]@{`
`@@ -337,9 +340,9 @@ function Compare-CIPPIntuneObject {`
`337`	`340`	`} else {`
`338`	`341`	`$child.choiceSettingValue.value`
`339`	`342`	`}`
`340`		`- if (!$childValue -and $child.simpleSettingValue.value) {`
`341`		`- $childValue = $child.simpleSettingValue.value`
`342`		`- }`
	`343`	`+ }`
	`344`	`+ if (!$childValue -and $null -ne $child.simpleSettingValue -and $null -ne $child.simpleSettingValue.value) {`
	`345`	`+ $childValue = $child.simpleSettingValue.value`
`343`	`346`	`}`
`344`	`347`
`345`	`348`	`# Add object to our temporary list`