Update nav query

This commit is contained in:
sunkaixuan 2024-03-20 10:33:35 +08:00
parent c49a0076cd
commit 2e6edfa375
2 changed files with 4 additions and 4 deletions

View File

@ -213,7 +213,7 @@ namespace SqlSugar
var bEntity = navObjectNameColumnInfo.PropertyInfo.PropertyType.GetGenericArguments()[0];
var bEntityInfo = this.Context.EntityMaintenance.GetEntityInfo(bEntity);
var bPkColumn = bEntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey);
if (bPkColumn == null && navObjectNameColumnInfo.Navigat.BClassId.HasValue())
if (navObjectNameColumnInfo.Navigat.BClassId.HasValue())
{
bPkColumn= bEntityInfo.Columns.FirstOrDefault(it => it.PropertyName == navObjectNameColumnInfo.Navigat.BClassId);
}
@ -222,7 +222,7 @@ namespace SqlSugar
bDb = GetCrossDatabase(bDb,bEntity);
bDb.InitMappingInfo(bEntity);
var listItemPkColumn = listItemEntity.Columns.Where(it => it.IsPrimarykey).FirstOrDefault();
if (listItemPkColumn == null && navObjectNameColumnInfo.Navigat.AClassId.HasValue())
if (navObjectNameColumnInfo.Navigat.AClassId.HasValue())
{
listItemPkColumn = listItemEntity.Columns.FirstOrDefault(it => it.PropertyName == navObjectNameColumnInfo.Navigat.AClassId);
}

View File

@ -211,11 +211,11 @@ namespace SqlSugar
var bPk = this.ProPertyEntity.Columns.FirstOrDefault(it => it.IsPrimarykey == true)?.DbColumnName;
var aPk = this.EntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey == true)?.DbColumnName;
if (bPk == null)
if (Navigat.BClassId.HasValue())
{
bPk= this.ProPertyEntity.Columns.FirstOrDefault(it => it.PropertyName == Navigat.BClassId)?.DbColumnName;
}
if (aPk == null)
if (Navigat.AClassId.HasValue())
{
aPk = this.EntityInfo.Columns.FirstOrDefault(it => it.PropertyName == Navigat.AClassId)?.DbColumnName;
}