v2.31
Fix migrations
This commit is contained in:
@@ -11,7 +11,7 @@ class Terminal extends Model {
|
||||
{
|
||||
$terminal_name = self::where('id', intval($id))
|
||||
->first();
|
||||
if ($terminal_name) {
|
||||
if ($terminal_name && $terminal_name['name'] !== null) {
|
||||
$terminal_name = $terminal_name['name'];
|
||||
} else {
|
||||
$terminal_name = 'Наименование рабочего места отсутствует';
|
||||
@@ -23,8 +23,9 @@ class Terminal extends Model {
|
||||
{
|
||||
$terminal_name = self::where('work_group', intval($group_id))
|
||||
->where('work_code', intval($group_code))
|
||||
->where('is_active', 1)
|
||||
->first();
|
||||
if ($terminal_name) {
|
||||
if ($terminal_name && $terminal_name['name'] !== null) {
|
||||
$terminal_name = $terminal_name['name'];
|
||||
} else {
|
||||
$terminal_name = 'Наименование рабочего места отсутствует';
|
||||
|
||||
Reference in New Issue
Block a user