From 09a102fea8b5a63206cd66996761b2144b2a5ac0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 19 Oct 2018 01:44:45 -0700
Subject: [PATCH] Only try to return a department if there is a matching field

---
 app/Importer/ItemImporter.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 701534a46..ea3233fd2 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -302,21 +302,24 @@ class ItemImporter extends Importer
      */
     public function createOrFetchDepartment($user_department_name)
     {
-        $department = Department::where('name', '=', $user_department_name)->first();
+        if ($user_department_name!='') {
+            $department = Department::where('name', '=', $user_department_name)->first();
 
-        if ($department) {
-            $this->log('A matching Department ' . $user_department_name . ' already exists');
-            return $department->id;
+            if ($department) {
+                $this->log('A matching Department ' . $user_department_name . ' already exists');
+                return $department->id;
+            }
+
+            $department = new Department();
+            $department->name = $user_department_name;
+
+            if ($department->save()) {
+                $this->log('Department ' . $user_department_name . ' was created');
+                return $department->id;
+            }
+            $this->logError($department, 'Department');
         }
 
-        $department = new Department();
-        $department->name = $user_department_name;
-
-        if ($department->save()) {
-            $this->log('Department ' . $user_department_name . ' was created');
-            return $department->id;
-        }
-        $this->logError($department, 'Department');
         return null;
     }