Merge pull request #182 from skoranda/CFM-384

Transmogrify handle empty OrgId affiliation (CFM-384)
COmanage · May 1, 2024 · 28c5be4 · 28c5be4
2 parents 3021191 + 0da79ef
commit 28c5be4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/Command/TransmogrifyCommand.php b/app/src/Command/TransmogrifyCommand.php
@@ -1371,8 +1371,10 @@ protected function split_external_identity(array $origRow, array $row) {
     // lookup the CO ID in the cache, however by the time we've been called
     // affiliation has been null'd out (since we're moving it to the role row).
     // So shove it back in before calling map_affiliation_type.
-    $row['affiliation'] = $origRow['affiliation'];
-    $roleRow['affiliation_type_id'] = $this->map_affiliation_type($row);
+    if(!empty($origRow['affiliation'])) {
+      $row['affiliation'] = $origRow['affiliation'];
+      $roleRow['affiliation_type_id'] = $this->map_affiliation_type($row);
+    }
 
     // Fix up changelog
     // Since we're creating a new row, we have to manually fix up booleans