From 5fb63604cf473adb67ef67c82d452f42836f5b4f Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Thu, 26 Jun 2025 10:34:43 +0800
Subject: [PATCH] Optimize the code

---
 .../SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs    | 8 ++++----
 Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs        | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs
index a97d5c0ca..a855a2204 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs
@@ -203,7 +203,7 @@ namespace SqlSugar
         {
             using (dataReader)
             {
-                if (type.Name.StartsWith("KeyValuePair"))
+                if (UtilMethods.IsKeyValuePairType(type))
                 {
                     return GetKeyValueList<T>(type, dataReader);
                 }
@@ -231,7 +231,7 @@ namespace SqlSugar
         {
             using (dataReader)
             {
-                if (type.Name.StartsWith("KeyValuePair"))
+                if (UtilMethods.IsKeyValuePairType(type))
                 {
                     return await GetKeyValueListAsync<T>(type, dataReader);
                 }
@@ -256,7 +256,7 @@ namespace SqlSugar
         }
         public virtual List<T> DataReaderToListNoUsing<T>(Type type, IDataReader dataReader)
         {
-            if (type.Name.StartsWith("KeyValuePair"))
+            if (UtilMethods.IsKeyValuePairType(type))
             {
                 return GetKeyValueList<T>(type, dataReader);
             }
@@ -275,7 +275,7 @@ namespace SqlSugar
         }
         public virtual Task<List<T>> DataReaderToListNoUsingAsync<T>(Type type, IDataReader dataReader)
         {
-            if (type.Name.StartsWith("KeyValuePair"))
+            if (UtilMethods.IsKeyValuePairType(type))
             {
                 return GetKeyValueListAsync<T>(type, dataReader);
             }
diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs
index c5d214d04..9e0b9e952 100644
--- a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs
@@ -18,6 +18,10 @@ namespace SqlSugar
 {
     public class UtilMethods
     {
+        public static bool IsKeyValuePairType(Type type)
+        {
+            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(KeyValuePair<,>);
+        }
         public static DataTable ConvertDateTimeOffsetToDateTime(DataTable table)
         {
             if (!table.Columns.Cast<DataColumn>().Any(it => it.DataType == typeof(DateTimeOffset)))