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-01-14 19:12:26 +00:00
parent 1e92f7aa55
commit 9e3b449e14
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/biz/FilterOptionsFromListKey.cs
View File

@@ -1,8 +1,8 @@
namespace AyaNova.Biz namespace AyaNova.Biz
{ {
internal static class FilterOptionsFromObjectKey internal static class DEPRECATED_FilterOptionsFromObjectKey
{ {
internal static FilterOptions Get(string listKey) internal static DEPRECATED_FilterOptions Get(string listKey)
{ {
if (string.IsNullOrWhiteSpace(listKey)) if (string.IsNullOrWhiteSpace(listKey))
return null; return null;

4
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -11,7 +11,7 @@ namespace AyaNova.Biz
{ {
public static class FilterSqlCriteriaBuilder public static class FilterSqlCriteriaBuilder
{ {
public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, FilterOptions filterOptions, long userId) public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List<ObjectField> objectFields, long userId)
{ {
if (string.IsNullOrWhiteSpace(dataFilter.Filter)) if (string.IsNullOrWhiteSpace(dataFilter.Filter))
@@ -38,7 +38,7 @@ namespace AyaNova.Biz
tagList = filterItem["value"].ToObject<List<String>>(); tagList = filterItem["value"].ToObject<List<String>>();
} }
var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type; var dataType = objectFields.Find(x => x.Key == fld).DataType;
sb.Append("("); sb.Append("(");
sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId)); sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId));
if (i < FilterArray.Count - 1) if (i < FilterArray.Count - 1)