From b0a9e1cef109e29b4b084c22d96adabe8320480d Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 14 Nov 2022 13:39:09 +0800 Subject: [PATCH] Update DataTableExtensions --- Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs | 4 ++-- Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs b/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs index 17425ce53..1ffa1d148 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs @@ -28,7 +28,7 @@ namespace SqlSugar var columns = source.Select(columnSelector).Distinct(); foreach (var column in columns) - table.Columns.Add(new DataColumn(column.ToString())); + table.Columns.Add(new DataColumn(column?.ToString())); var rows = source.GroupBy(rowSelector.Compile()) .Select(rowGroup => new @@ -89,7 +89,7 @@ namespace SqlSugar rowName = "Group_"+string.Join("_", ((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name)); var columns = source.Select(columnSelector).Distinct(); - cols = (new[] { rowName }).Concat(columns.Select(x => x.ToString())).ToList(); + cols = (new[] { rowName }).Concat(columns.Select(x => x?.ToString())).ToList(); var rows = source.GroupBy(rowSelector.Compile()) diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs index 17425ce53..1ffa1d148 100644 --- a/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs +++ b/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs @@ -28,7 +28,7 @@ namespace SqlSugar var columns = source.Select(columnSelector).Distinct(); foreach (var column in columns) - table.Columns.Add(new DataColumn(column.ToString())); + table.Columns.Add(new DataColumn(column?.ToString())); var rows = source.GroupBy(rowSelector.Compile()) .Select(rowGroup => new @@ -89,7 +89,7 @@ namespace SqlSugar rowName = "Group_"+string.Join("_", ((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name)); var columns = source.Select(columnSelector).Distinct(); - cols = (new[] { rowName }).Concat(columns.Select(x => x.ToString())).ToList(); + cols = (new[] { rowName }).Concat(columns.Select(x => x?.ToString())).ToList(); var rows = source.GroupBy(rowSelector.Compile())