update core

This commit is contained in:
sunkaixuna
2022-01-18 20:29:42 +08:00
parent d093386910
commit b0a9901272
2 changed files with 17 additions and 1 deletions

View File

@@ -524,6 +524,10 @@ namespace SqlSugar
{
return false;
}
else if ((item as MethodCallExpression).Method.Name == "IsNull")
{
return false;
}
else if ((item as MethodCallExpression).Method.Name == "End"&&item.ToString().Contains("IF("))
{
return false;
@@ -621,7 +625,14 @@ namespace SqlSugar
{
dbColumnName = mappingInfo.DbColumnName;
}
asName = this.Context.GetTranslationText(shortName+"."+item.Type.Name + "." + propertyName);
if (shortName != null && shortName.ObjToString().Contains(this.Context.SqlTranslationLeft)&&this.Context.IsSingle)
{
asName = this.Context.GetTranslationText(item.Type.Name + "." + propertyName);
}
else
{
asName = this.Context.GetTranslationText(shortName + "." + item.Type.Name + "." + propertyName);
}
if (Context.IsJoin)
{
this.Context.Result.Append(Context.GetAsString(asName, dbColumnName, shortName.ObjToString()));

View File

@@ -436,11 +436,16 @@ namespace SqlSugar
{
var key = typeName + "." + name;
var info = readerValues.Select(it => it.Key).FirstOrDefault(it => it.ToLower() == key.ToLower());
var oldInfo = info;
if (mappingKeys!=null&&mappingKeys.ContainsKey(item.Name))
{
key = mappingKeys[item.Name]+"."+typeName + "." + name;
info = readerValues.Select(it => it.Key).FirstOrDefault(it => it.ToLower() == key.ToLower());
}
if (info == null&&oldInfo!=null)
{
info = oldInfo;
}
if (info != null)
{
var addItem = readerValues[info];