lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-06-28 13:34:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-05-05 14:54:15 +08:00
parent 2c022a6e98
commit c30fdad89d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs
View File

@ -672,12 +672,12 @@ namespace SqlSugar
var allColumns = this.Context.EntityMaintenance.GetEntityInfo(tType) var allColumns = this.Context.EntityMaintenance.GetEntityInfo(tType)
.Columns; .Columns;
var columns = allColumns var columns = allColumns
.Where(it=> this.QueryBuilder.AppendNavInfo.Result.First().result.ContainsKey("SugarNav_" + it.PropertyName)) .Where(a=> this.QueryBuilder.AppendNavInfo.Result.First().result.ContainsKey("SugarNav_" + a.PropertyName))
.ToList(); .ToList();
var listType = typeof(List<>).MakeGenericType(tType); var listType = typeof(List<>).MakeGenericType(tType);
var outList=SelectNavQuery_SetList(result, it, p, tType, columns, listType); var outList=SelectNavQuery_SetList(result, it, p, tType, columns, listType);
it.GetType().GetMethod("Execute").Invoke(it, null); it.GetType().GetMethod("Execute").Invoke(it, null);
SelectNavQuery_MappingList(it,result, outList, allColumns.Where(it=>it.Navigat!=null).ToList()); SelectNavQuery_MappingList(it,result, outList, allColumns.Where(a=>a.Navigat!=null).ToList());
} }
} }
@ -690,7 +690,7 @@ namespace SqlSugar
foreach (var item in this.QueryBuilder.AppendNavInfo.MappingNavProperties) foreach (var item in this.QueryBuilder.AppendNavInfo.MappingNavProperties)
{ {
var rightName = item.Value.Name; var rightName = item.Value.Name;
var rightColumnInfo = columnInfos.FirstOrDefault(it => it.PropertyName == rightName); var rightColumnInfo = columnInfos.FirstOrDefault(a => a.PropertyName == rightName);
var rightValue=rightColumnInfo.PropertyInfo.GetValue(rightObject); var rightValue=rightColumnInfo.PropertyInfo.GetValue(rightObject);
var leftName = item.Key; var leftName = item.Key;
//// var rightColumn=col //// var rightColumn=col

2
Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs
View File

@ -163,7 +163,7 @@ namespace SqlSugar
case DateType.Minute: case DateType.Minute:
return $" ( ( ( DATE_PART('day', {end} - {begin}) ) * 24 + DATE_PART('hour', {end} - {begin} ) ) * 60 + DATE_PART('minute', {end} - {begin} ) )"; return $" ( ( ( DATE_PART('day', {end} - {begin}) ) * 24 + DATE_PART('hour', {end} - {begin} ) ) * 60 + DATE_PART('minute', {end} - {begin} ) )";
case DateType.Second: case DateType.Second:
return $" ( ( ( DATE_PART('day', {end} - {begin}) ) * 24 + DATE_PART('hour', {end} - {begin} ) ) * 60 + DATE_PART('minute', {end} - {begin} ) ) * 60 + DATE_PART('minute', {end} - {begin} )"; return $" ( ( ( DATE_PART('day', {end} - {begin}) ) * 24 + DATE_PART('hour', {end} - {begin} ) ) * 60 + DATE_PART('minute', {end} - {begin} ) ) * 60 + DATE_PART('second', {end} - {begin} )";
case DateType.Millisecond: case DateType.Millisecond:
break; break;
default: default: