From 9e3b449e14889c70ff47f773ea7753a26b40ac97 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 14 Jan 2020 19:12:26 +0000 Subject: [PATCH] --- server/AyaNova/biz/FilterOptionsFromListKey.cs | 4 ++-- server/AyaNova/biz/FilterSqlCriteriaBuilder.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/biz/FilterOptionsFromListKey.cs b/server/AyaNova/biz/FilterOptionsFromListKey.cs index b49f337c..076be49e 100644 --- a/server/AyaNova/biz/FilterOptionsFromListKey.cs +++ b/server/AyaNova/biz/FilterOptionsFromListKey.cs @@ -1,8 +1,8 @@ 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)) return null; diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index 69947c0c..221c950a 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -11,7 +11,7 @@ namespace AyaNova.Biz { 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 objectFields, long userId) { if (string.IsNullOrWhiteSpace(dataFilter.Filter)) @@ -38,7 +38,7 @@ namespace AyaNova.Biz tagList = filterItem["value"].ToObject>(); } - var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type; + var dataType = objectFields.Find(x => x.Key == fld).DataType; sb.Append("("); sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId)); if (i < FilterArray.Count - 1)