From 50122ef34604200b45882547ce87a121fb4fa30b Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 1 Sep 2022 18:57:13 +0800 Subject: [PATCH] Update .net core project --- .../Abstract/DbMaintenanceProvider/Methods.cs | 2 +- .../Abstract/FastestProvider/SplitFastest.cs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs index c994462d3..21f933342 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs @@ -378,7 +378,7 @@ namespace SqlSugar { defaultValue = ""; } - if (defaultValue.IsDate()) + if (defaultValue.IsDate() && !AddDefaultValueSql.Contains("'{2}'")) { defaultValue = "'" + defaultValue + "'"; } diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/SplitFastest.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/SplitFastest.cs index 718e0f05a..5b3759e0c 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/SplitFastest.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/SplitFastest.cs @@ -114,11 +114,17 @@ namespace SqlSugar Check.Exception(attribute == null, $"{typeof(T).Name} need SplitTableAttribute"); groupModels = new List(); var db = FastestProvider.context; + var hasSplitField = typeof(T).GetProperties().Any(it => it.GetCustomAttribute() != null); foreach (var item in datas) { - var value = db.SplitHelper().GetValue(attribute.SplitType, item); - var tableName = db.SplitHelper().GetTableName(attribute.SplitType,value); - groupModels.Add(new GroupModel() { GroupName = tableName, Item = item }); + if (groupModels.Count > 0 && !hasSplitField) + groupModels.Add(new GroupModel() { GroupName = groupModels[0].GroupName, Item = item }); + else + { + var value = db.SplitHelper().GetValue(attribute.SplitType, item); + var tableName = db.SplitHelper().GetTableName(attribute.SplitType, value); + groupModels.Add(new GroupModel() { GroupName = tableName, Item = item }); + } } result = 0; }