Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SieveModel Submodule Test
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nguyenvu
SieveModel Submodule Test
Commits
8df59de9
Commit
8df59de9
authored
Jul 28, 2020
by
thienvo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed
parent
7ba61ec3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
SieveProcessor.cs
Sieve/Services/SieveProcessor.cs
+14
-5
No files found.
Sieve/Services/SieveProcessor.cs
View file @
8df59de9
...
@@ -477,9 +477,10 @@ namespace Sieve.Services
...
@@ -477,9 +477,10 @@ namespace Sieve.Services
}
}
outerExpression
=
Expression
.
And
(
outerExpression
,
innerExpression
);
outerExpression
=
Expression
.
And
(
outerExpression
,
innerExpression
);
}
}
return
outerExpression
==
null
var
data
=
outerExpression
==
null
?
result
?
result
:
result
.
Where
(
Expression
.
Lambda
<
Func
<
TEntity
,
bool
>>(
outerExpression
,
parameterExpression
));
:
result
.
Where
(
Expression
.
Lambda
<
Func
<
TEntity
,
bool
>>(
outerExpression
,
parameterExpression
));
return
data
;
}
}
private
static
string
GetDynamicQueryString
(
TFilterTerm
filterTerm
,
string
property
,
string
value
)
private
static
string
GetDynamicQueryString
(
TFilterTerm
filterTerm
,
string
property
,
string
value
)
{
{
...
@@ -570,9 +571,9 @@ namespace Sieve.Services
...
@@ -570,9 +571,9 @@ namespace Sieve.Services
result
=
ApplyCustomMethod
(
result
,
sortTerm
.
Name
,
_customSortMethods
,
result
=
ApplyCustomMethod
(
result
,
sortTerm
.
Name
,
_customSortMethods
,
new
object
[]
new
object
[]
{
{
result
,
result
,
useThenBy
,
useThenBy
,
sortTerm
.
Descending
sortTerm
.
Descending
},
dataForCustomMethods
);
},
dataForCustomMethods
);
}
}
useThenBy
=
true
;
useThenBy
=
true
;
...
@@ -601,7 +602,15 @@ namespace Sieve.Services
...
@@ -601,7 +602,15 @@ namespace Sieve.Services
var
maxPageSize
=
_options
.
Value
.
MaxPageSize
>
0
?
_options
.
Value
.
MaxPageSize
:
pageSize
;
var
maxPageSize
=
_options
.
Value
.
MaxPageSize
>
0
?
_options
.
Value
.
MaxPageSize
:
pageSize
;
if
(
ResultCountBeForeApplyPagination
==
0
)
if
(
ResultCountBeForeApplyPagination
==
0
)
{
{
ResultCountBeForeApplyPagination
=
result
.
Count
();
try
{
ResultCountBeForeApplyPagination
=
result
!=
null
?
result
.
Count
()
:
0
;
}
catch
(
Exception
)
{
ResultCountBeForeApplyPagination
=
0
;
}
}
}
if
(
pageSize
>
0
)
if
(
pageSize
>
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment