lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 02:14:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan
2022-07-30 18:48:09 +08:00
parent cbc5e18636
commit ce39c21098
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@@ -515,10 +515,22 @@ namespace SqlSugar
var queryable = this.Context.Queryable<object>(); var queryable = this.Context.Queryable<object>();
if (method.Method.Name == "Where") if (method.Method.Name == "Where")
{ {
CheckHasRootShortName(method.Arguments[0], method.Arguments[1]); if (method.Arguments[1].Type == typeof(List<IConditionalModel>))
var exp = method.Arguments[1]; {
where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); //var x=method.Arguments[1];
SetTableShortName(result, queryable); var conditionals = ExpressionTool.GetExpressionValue(method.Arguments[1]) as List<IConditionalModel>;
var whereObj = queryable.QueryBuilder.Builder.ConditionalModelToSql(conditionals);
where.Add(whereObj.Key);
if(whereObj.Value!=null)
result.Parameters.AddRange(whereObj.Value);
}
else
{
CheckHasRootShortName(method.Arguments[0], method.Arguments[1]);
var exp = method.Arguments[1];
where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
}
} }
else if (method.Method.Name == "WhereIF") else if (method.Method.Name == "WhereIF")
{ {
@@ -557,7 +569,7 @@ namespace SqlSugar
var type = types[0]; var type = types[0];
var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type); var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type);
this.Context.InitMappingInfo(type); this.Context.InitMappingInfo(type);
Check.ExceptionEasy(newExp.Type != entityInfo.Type, $" new {newExp.Type .Name}is error ,use Select(it=>new {entityInfo.Type.Name})",$"new {newExp.Type.Name}是错误的，请使用Select(it=>new {entityInfo.Type.Name})"); Check.ExceptionEasy(newExp.Type != entityInfo.Type, $" new {newExp.Type.Name}is error ,use Select(it=>new {entityInfo.Type.Name})", $"new {newExp.Type.Name}是错误的，请使用Select(it=>new {entityInfo.Type.Name})");
if (entityInfo.Columns.Count(x => x.Navigat != null) == 0) if (entityInfo.Columns.Count(x => x.Navigat != null) == 0)
{ {
result.SelectString = (" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.SelectSingle).GetString()); result.SelectString = (" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.SelectSingle).GetString());
@@ -570,7 +582,7 @@ namespace SqlSugar
var pkName = pkInfo.DbColumnName; var pkName = pkInfo.DbColumnName;
AppColumns(result, queryable, pkName); AppColumns(result, queryable, pkName);
} }
foreach (var nav in entityInfo.Columns.Where(x => x.Navigat != null&&x.Navigat.NavigatType==NavigateType.OneToOne)) foreach (var nav in entityInfo.Columns.Where(x => x.Navigat != null && x.Navigat.NavigatType == NavigateType.OneToOne))
{ {
var navColumn = entityInfo.Columns.FirstOrDefault(it => it.PropertyName == nav.Navigat.Name); var navColumn = entityInfo.Columns.FirstOrDefault(it => it.PropertyName == nav.Navigat.Name);
if (navColumn != null) if (navColumn != null)

6
Src/Asp.NetCore2/SqlSugar/Utilities/CommonExtensions.cs
View File

@@ -28,7 +28,11 @@ namespace SqlSugar
{ {
return new List<T>() { thisValue }; return new List<T>() { thisValue };
} }
public static bool Any<T>(this IEnumerable<T> thisValue, IEnumerable<IConditionalModel> conditionalModels) public static bool Any<T>(this IEnumerable<T> thisValue, List<IConditionalModel> conditionalModels)
{
throw new Exception("Can only be used in expressions");
}
public static IEnumerable<T> Where<T>(this IEnumerable<T> thisValue, List<IConditionalModel> conditionalModels)
{ {
throw new Exception("Can only be used in expressions"); throw new Exception("Can only be used in expressions");
} }