Update .net core project

This commit is contained in:
sunkaixuan 2022-06-11 17:12:00 +08:00
parent b3aa899cd1
commit 1190589f39
2 changed files with 12 additions and 2 deletions

View File

@ -136,6 +136,11 @@ namespace SqlSugar
public virtual long ExecuteReturnSnowflakeId() public virtual long ExecuteReturnSnowflakeId()
{ {
if (this.InsertObjs.Length > 1)
{
return this.ExecuteReturnSnowflakeIdList().First();
}
var id = SnowFlakeSingle.instance.getID(); var id = SnowFlakeSingle.instance.getID();
var entity = this.Context.EntityMaintenance.GetEntityInfo<T>(); var entity = this.Context.EntityMaintenance.GetEntityInfo<T>();
var snowProperty=entity.Columns.FirstOrDefault(it => it.IsPrimarykey && it.PropertyInfo.PropertyType == UtilConstants.LongType); var snowProperty=entity.Columns.FirstOrDefault(it => it.IsPrimarykey && it.PropertyInfo.PropertyType == UtilConstants.LongType);

View File

@ -317,13 +317,18 @@ namespace SqlSugar
break; break;
case ResolveExpressType.FieldSingle: case ResolveExpressType.FieldSingle:
case ResolveExpressType.FieldMultiple: 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 value = GetNewExpressionValue(express.Object);
var dateString = GeDateFormat(format, value); var dateString = GeDateFormat(format, value);
base.AppendValue(parameter, isLeft, dateString); base.AppendValue(parameter, isLeft, dateString);
} }
else
{
var value = GetNewExpressionValue(express,this.Context.IsJoin?ResolveExpressType.WhereMultiple: ResolveExpressType.WhereSingle);
base.AppendValue(parameter, isLeft, value);
}
break; break;
default: default:
break; break;