diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index aa6c23d30..136b9bfe9 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -120,15 +120,14 @@ class UserImporter extends ItemImporter */ public function createOrFetchDepartment($department_name) { - + if (is_null($department_name) || $department_name == ''){ return null; } - + $department = Department::where(['name' => $department_name])->first(); if ($department) { - $this->log('A matching department '.$department_name.' already exists'); - + $this->log('A matching department ' . $department_name . ' already exists'); return $department->id; } @@ -137,15 +136,14 @@ class UserImporter extends ItemImporter $department->user_id = $this->user_id; if ($department->save()) { - $this->log('department '.$department_name.' was created'); - + $this->log('department ' . $department_name . ' was created'); return $department->id; } $this->logError($department, 'Department'); - return null; } + public function sendWelcome($send = true) {