|
@@ -589,25 +589,30 @@ namespace InABox.Core
|
|
|
if (value is string && type == typeof(byte[]))
|
|
|
return Convert.FromBase64String(value as string);
|
|
|
|
|
|
- if (value is FilterConstant && type == typeof(DateTime))
|
|
|
+ if(value is FilterConstant constant)
|
|
|
{
|
|
|
- if (Equals(FilterConstant.NoDateProvided, value))
|
|
|
- return DateTime.MinValue;
|
|
|
- return value;
|
|
|
- }
|
|
|
-
|
|
|
- if (value is FilterConstant && type == typeof(double))
|
|
|
- {
|
|
|
- return value;
|
|
|
- // if (Equals(FilterConstant.Zero, value))
|
|
|
- // return (double)0;
|
|
|
- }
|
|
|
-
|
|
|
- if (value is FilterConstant && type == typeof(int))
|
|
|
- {
|
|
|
- return value;
|
|
|
- // if (Equals(FilterConstant.Zero, value))
|
|
|
- // return 0;
|
|
|
+ if (type == typeof(DateTime))
|
|
|
+ {
|
|
|
+ if (Equals(FilterConstant.Null, value))
|
|
|
+ return DateTime.MinValue;
|
|
|
+ return value;
|
|
|
+ }
|
|
|
+ if (type == typeof(Guid) && constant == FilterConstant.Null)
|
|
|
+ {
|
|
|
+ return Guid.Empty;
|
|
|
+ }
|
|
|
+ if (type == typeof(double))
|
|
|
+ {
|
|
|
+ return value;
|
|
|
+ // if (Equals(FilterConstant.Zero, value))
|
|
|
+ // return (double)0;
|
|
|
+ }
|
|
|
+ if (type == typeof(int))
|
|
|
+ {
|
|
|
+ return value;
|
|
|
+ // if (Equals(FilterConstant.Zero, value))
|
|
|
+ // return 0;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (type == typeof(String))
|