diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 3143e99..f12a075 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -253,14 +253,14 @@ namespace SunlightAggregationManager.UserClass if (com_ == "SYSDB")//本机sqlite数据库 { DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(da_, null)?.Tables[0] ?? new DataTable(); - data_.Add("DB", JsonSerializer.Serialize(resultTable)); + data_.Add("DB", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); data_.Add("Comm", "SYSDB"); data_.Add("Enterprise", MainWindowViewModel.Enterprise); } else if (com_ == "DBCDB")//系统dbc数据库 { DataTable resultTable = await MainWindowViewModel.dataBase.ExecuteQueryAsync(da_); - data_.Add("DB", JsonSerializer.Serialize(resultTable)); + data_.Add("DB", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); data_.Add("Comm", "DBCDB"); data_.Add("Enterprise", MainWindowViewModel.Enterprise); } diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 7ddb4aa..66e1444 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -324,9 +324,14 @@ namespace SunlightAggregationManager.ViewModel { lock (DB) { - DataRow drEmployee = DB.Select(key).First(); - object? index = drEmployee.Field(name); - return index; + DataRow[] dataRows = DB.Select(key); + if (dataRows.Count() > 0) + { + DataRow drEmployee = dataRows.First(); + object? index = drEmployee.Field(name); + return index; + } + else { return null; } } } catch (Exception ex)