From 1190589f398cb3a319cb778049364ebd790adf34 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sat, 11 Jun 2022 17:12:00 +0800 Subject: [PATCH] Update .net core project --- .../Abstract/InsertableProvider/InsertableProvider.cs | 5 +++++ .../ResolveItems/MethodCallExpressionResolve.cs | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index 2d87dc836..0058a1973 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -136,6 +136,11 @@ namespace SqlSugar public virtual long ExecuteReturnSnowflakeId() { + if (this.InsertObjs.Length > 1) + { + return this.ExecuteReturnSnowflakeIdList().First(); + } + var id = SnowFlakeSingle.instance.getID(); var entity = this.Context.EntityMaintenance.GetEntityInfo(); var snowProperty=entity.Columns.FirstOrDefault(it => it.IsPrimarykey && it.PropertyInfo.PropertyType == UtilConstants.LongType); diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index cce1dc9e6..f0a917f32 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -317,13 +317,18 @@ namespace SqlSugar break; case ResolveExpressType.FieldSingle: case ResolveExpressType.FieldMultiple: - if (express.Method.Name == "ToString" && express.Object!=null&&express.Object?.Type == UtilConstants.DateType) + if (express.Method.Name == "ToString" && express.Object != null && express.Object?.Type == UtilConstants.DateType) { - var format = (args[0] as ConstantExpression).Value+""; + var format = (args[0] as ConstantExpression).Value + ""; var value = GetNewExpressionValue(express.Object); var dateString = GeDateFormat(format, value); base.AppendValue(parameter, isLeft, dateString); } + else + { + var value = GetNewExpressionValue(express,this.Context.IsJoin?ResolveExpressType.WhereMultiple: ResolveExpressType.WhereSingle); + base.AppendValue(parameter, isLeft, value); + } break; default: break;