lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Only try to return a department if there is a matching field

Browse source
This commit is contained in:
snipe 2018-10-19 01:44:45 -07:00
parent 304fce73fc
commit 09a102fea8
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/Importer/ItemImporter.php
View file

@ -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;
}