admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-13 00:28:39 +00:00
parent 046fd00f85
commit 2d56814455
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -81,7 +81,7 @@ namespace AyaNova.DataList
if (HasFilter) if (HasFilter)
{ {
//WHERE CLAUSE - FILTER //WHERE CLAUSE - FILTER
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, DataList.FieldDefinitions, UserId); qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, UserId);
} }
if (HasSort) if (HasSort)
{ {

4
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -11,7 +11,7 @@ namespace AyaNova.DataList
{ {
public static class DataListSqlFilterCriteriaBuilder public static class DataListSqlFilterCriteriaBuilder
{ {
public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, string filterJson, List<AyaDataListFieldDefinition> objectFields, long userId) public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, string filterJson, long userId)
{ {
if (string.IsNullOrWhiteSpace(filterJson)) if (string.IsNullOrWhiteSpace(filterJson))
@@ -38,7 +38,7 @@ namespace AyaNova.DataList
tagList = filterItem["value"].ToObject<List<String>>(); tagList = filterItem["value"].ToObject<List<String>>();
} }
var dataType = objectFields.Find(x => x.FieldKey.ToLowerInvariant() == fld).UiFieldDataType; var dataType = objectFieldsList.Find(x => x.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
sb.Append("("); sb.Append("(");
//Get the correct sql column name //Get the correct sql column name