has search, ignore status
This commit is contained in:
parent
6ee83119ee
commit
e1b075580e
@ -176,6 +176,8 @@ public abstract class AbstractBaseController {
|
||||
search.limit(limit);
|
||||
}
|
||||
if (StringUtils.isNotBlank(strSearch)) {
|
||||
search.attr("hasSearch", true);
|
||||
|
||||
val orSearch = new Search();
|
||||
for (val col : searchCols()) {
|
||||
orSearch.or(new Search().like(col, decodeLike(strSearch)));
|
||||
|
@ -221,6 +221,12 @@ public class CustomerController
|
||||
*/
|
||||
@Override
|
||||
protected Search defaultFilter(final Search search) {
|
||||
|
||||
if (search.hasAttr("hasSearch")) {
|
||||
return search;
|
||||
}
|
||||
|
||||
// default status not NA
|
||||
val statusCol = CRITERION_COLS.get("status");
|
||||
return search.and(new Search()
|
||||
.notNull(statusCol)
|
||||
|
Loading…
x
Reference in New Issue
Block a user