diff --git a/Src/Asp.Net/SqlSugar/Abstract/ExpressionableProvider/Expressionable.cs b/Src/Asp.Net/SqlSugar/Abstract/ExpressionableProvider/Expressionable.cs index a339e0288..caff94a66 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/ExpressionableProvider/Expressionable.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/ExpressionableProvider/Expressionable.cs @@ -50,36 +50,36 @@ namespace SqlSugar return _exp; } } - public class Expressionable where T : class, new() where T2 : class, new() + public class Expressionable where T : class, new() where T2 : class, new() { - Expression> _exp = null; + Expression> _exp = null; - public Expressionable And(Expression> exp) + public Expressionable And(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable AndIF(bool isAnd, Expression> exp) + public Expressionable AndIF(bool isAnd, Expression> exp) { if (isAnd) And(exp); return this; } - public Expressionable Or(Expression> exp) + public Expressionable Or(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable OrIF(bool isOr, Expression> exp) + public Expressionable OrIF(bool isOr, Expression> exp) { if (isOr) Or(exp); @@ -87,43 +87,43 @@ namespace SqlSugar } - public Expression> ToExpression() + public Expression> ToExpression() { if (_exp == null) - _exp = (it,t2) => true; + _exp = (it, t2) => true; return _exp; } } - public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() + public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() { - Expression> _exp = null; + Expression> _exp = null; - public Expressionable And(Expression> exp) + public Expressionable And(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable AndIF(bool isAnd, Expression> exp) + public Expressionable AndIF(bool isAnd, Expression> exp) { if (isAnd) And(exp); return this; } - public Expressionable Or(Expression> exp) + public Expressionable Or(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable OrIF(bool isOr, Expression> exp) + public Expressionable OrIF(bool isOr, Expression> exp) { if (isOr) Or(exp); @@ -131,43 +131,43 @@ namespace SqlSugar } - public Expression> ToExpression() + public Expression> ToExpression() { if (_exp == null) - _exp = (it, t2,t3) => true; + _exp = (it, t2, t3) => true; return _exp; } } - public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() + public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() { - Expression> _exp = null; + Expression> _exp = null; - public Expressionable And(Expression> exp) + public Expressionable And(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable AndIF(bool isAnd, Expression> exp) + public Expressionable AndIF(bool isAnd, Expression> exp) { if (isAnd) And(exp); return this; } - public Expressionable Or(Expression> exp) + public Expressionable Or(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable OrIF(bool isOr, Expression> exp) + public Expressionable OrIF(bool isOr, Expression> exp) { if (isOr) Or(exp); @@ -175,43 +175,43 @@ namespace SqlSugar } - public Expression> ToExpression() + public Expression> ToExpression() { if (_exp == null) - _exp = (it, t2, t3,t4) => true; + _exp = (it, t2, t3, t4) => true; return _exp; } } - public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5: class,new() + public class Expressionable where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() { - Expression> _exp = null; + Expression> _exp = null; - public Expressionable And(Expression> exp) + public Expressionable And(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.AndAlso(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable AndIF(bool isAnd, Expression> exp) + public Expressionable AndIF(bool isAnd, Expression> exp) { if (isAnd) And(exp); return this; } - public Expressionable Or(Expression> exp) + public Expressionable Or(Expression> exp) { if (_exp == null) _exp = exp; else - _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); + _exp = Expression.Lambda>(Expression.OrElse(_exp.Body, exp.Body), _exp.Parameters); return this; } - public Expressionable OrIF(bool isOr, Expression> exp) + public Expressionable OrIF(bool isOr, Expression> exp) { if (isOr) Or(exp); @@ -219,10 +219,10 @@ namespace SqlSugar } - public Expression> ToExpression() + public Expression> ToExpression() { if (_exp == null) - _exp = (it, t2, t3, t4,T5) => true; + _exp = (it, t2, t3, t4, T5) => true; return _exp; } } @@ -233,21 +233,21 @@ namespace SqlSugar { return new Expressionable(); } - public static Expressionable Create() where T : class, new() where T2 : class, new() + public static Expressionable Create() where T : class, new() where T2 : class, new() { - return new Expressionable(); + return new Expressionable(); } - public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() + public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() { - return new Expressionable(); + return new Expressionable(); } - public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() where T4: class, new() + public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() { - return new Expressionable(); + return new Expressionable(); } - public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5:class,new() + public static Expressionable Create() where T : class, new() where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() { - return new Expressionable(); + return new Expressionable(); } } }