From 6b1c3008a248aba7587939a2c231a8bec06d429f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=A4=D0=B5=D0=B4=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Wed, 1 May 2024 21:21:08 +0400 Subject: [PATCH] fix --- Diner/DinerView/FormFoods.cs | 2 +- Diner/DinerView/FormSnackFood.cs | 2 +- Diner/DineryBusinessLogic/BusinessLogic/FoodLogic.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Diner/DinerView/FormFoods.cs b/Diner/DinerView/FormFoods.cs index 172602e..0ce206a 100644 --- a/Diner/DinerView/FormFoods.cs +++ b/Diner/DinerView/FormFoods.cs @@ -34,7 +34,7 @@ namespace DinerView { dataGridView.DataSource = list; dataGridView.Columns["ID"].Visible = false; - dataGridView.Columns["ProductName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка продуктов"); } diff --git a/Diner/DinerView/FormSnackFood.cs b/Diner/DinerView/FormSnackFood.cs index 3719e0f..fe603ca 100644 --- a/Diner/DinerView/FormSnackFood.cs +++ b/Diner/DinerView/FormSnackFood.cs @@ -57,7 +57,7 @@ namespace DinerView _list = logic.ReadList(null); if (_list != null) { - comboBoxComponent.DisplayMember = "ProductName"; + comboBoxComponent.DisplayMember = "ComponentName"; comboBoxComponent.ValueMember = "ID"; comboBoxComponent.DataSource = _list; comboBoxComponent.SelectedItem = null; diff --git a/Diner/DineryBusinessLogic/BusinessLogic/FoodLogic.cs b/Diner/DineryBusinessLogic/BusinessLogic/FoodLogic.cs index b6d48d3..fec2db9 100644 --- a/Diner/DineryBusinessLogic/BusinessLogic/FoodLogic.cs +++ b/Diner/DineryBusinessLogic/BusinessLogic/FoodLogic.cs @@ -61,7 +61,7 @@ namespace DineryBusinessLogic.BusinessLogic { _logger.LogInformation("ReadList. ProductName:{ProductName}. ID:{ID}", model?.ComponentName, model?.ID); var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model); - if (list == null) { + if (list.Count == 0) { _logger.LogWarning("ReadList return null list"); return null; }