mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-19 01:58:13 +08:00
update core
This commit is contained in:
@@ -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()));
|
||||
|
@@ -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];
|
||||
|
Reference in New Issue
Block a user