mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-08-24 16:18:47 +08:00
Rename
This commit is contained in:
parent
d41dd82a81
commit
15f6717508
@ -40,7 +40,7 @@ namespace SqlSugar
|
|||||||
_Filters.RemoveAll(it => it.FilterName == filterName);
|
_Filters.RemoveAll(it => it.FilterName == filterName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SqlFilterItem> GeFilterList
|
public List<SqlFilterItem> GetFilterList
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
|
@ -1797,9 +1797,9 @@ namespace SqlSugar
|
|||||||
protected void _Filter(string FilterName, bool isDisabledGobalFilter)
|
protected void _Filter(string FilterName, bool isDisabledGobalFilter)
|
||||||
{
|
{
|
||||||
QueryBuilder.IsDisabledGobalFilter = isDisabledGobalFilter;
|
QueryBuilder.IsDisabledGobalFilter = isDisabledGobalFilter;
|
||||||
if (this.Context.QueryFilter.GeFilterList.HasValue() && FilterName.HasValue())
|
if (this.Context.QueryFilter.GetFilterList.HasValue() && FilterName.HasValue())
|
||||||
{
|
{
|
||||||
var list = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName == FilterName && it.IsJoinQuery == !QueryBuilder.IsSingle());
|
var list = this.Context.QueryFilter.GetFilterList.Where(it => it.FilterName == FilterName && it.IsJoinQuery == !QueryBuilder.IsSingle());
|
||||||
foreach (var item in list)
|
foreach (var item in list)
|
||||||
{
|
{
|
||||||
var filterResult = item.FilterValue(this.Context);
|
var filterResult = item.FilterValue(this.Context);
|
||||||
|
@ -312,9 +312,9 @@ namespace SqlSugar
|
|||||||
var db = Context;
|
var db = Context;
|
||||||
BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic| BindingFlags.Public;
|
BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic| BindingFlags.Public;
|
||||||
var index = 0;
|
var index = 0;
|
||||||
if (db.QueryFilter.GeFilterList != null)
|
if (db.QueryFilter.GetFilterList != null)
|
||||||
{
|
{
|
||||||
foreach (var item in db.QueryFilter.GeFilterList)
|
foreach (var item in db.QueryFilter.GetFilterList)
|
||||||
{
|
{
|
||||||
if (this.RemoveFilters != null && this.RemoveFilters.Length > 0)
|
if (this.RemoveFilters != null && this.RemoveFilters.Length > 0)
|
||||||
{
|
{
|
||||||
@ -384,9 +384,9 @@ namespace SqlSugar
|
|||||||
|
|
||||||
public virtual void AppendFilter()
|
public virtual void AppendFilter()
|
||||||
{
|
{
|
||||||
if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.HasValue())
|
if (!IsDisabledGobalFilter && this.Context.QueryFilter.GetFilterList.HasValue())
|
||||||
{
|
{
|
||||||
var gobalFilterList = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList();
|
var gobalFilterList = this.Context.QueryFilter.GetFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList();
|
||||||
if (this.RemoveFilters != null && this.RemoveFilters.Length > 0)
|
if (this.RemoveFilters != null && this.RemoveFilters.Length > 0)
|
||||||
{
|
{
|
||||||
gobalFilterList = gobalFilterList.Where(it => !this.RemoveFilters.Contains(it.type)).ToList();
|
gobalFilterList = gobalFilterList.Where(it => !this.RemoveFilters.Contains(it.type)).ToList();
|
||||||
|
@ -49,8 +49,8 @@ namespace SqlSugar
|
|||||||
BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic;
|
BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic;
|
||||||
Type type = this.Context.SubTableType;
|
Type type = this.Context.SubTableType;
|
||||||
var isWhere = HasWhere;
|
var isWhere = HasWhere;
|
||||||
if (db.QueryFilter.GeFilterList != null) {
|
if (db.QueryFilter.GetFilterList != null) {
|
||||||
foreach (var item in db.QueryFilter.GeFilterList)
|
foreach (var item in db.QueryFilter.GetFilterList)
|
||||||
{
|
{
|
||||||
PropertyInfo field = item.GetType().GetProperty("exp", flag);
|
PropertyInfo field = item.GetType().GetProperty("exp", flag);
|
||||||
if (field != null)
|
if (field != null)
|
||||||
|
@ -9,6 +9,6 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
IFilter Add(SqlFilterItem filter);
|
IFilter Add(SqlFilterItem filter);
|
||||||
void Remove(string filterName);
|
void Remove(string filterName);
|
||||||
List<SqlFilterItem> GeFilterList { get; }
|
List<SqlFilterItem> GetFilterList { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user