donghuang/lemo-crm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

has search, ignore status

Browse Source
This commit is contained in:
Donghuang 2023-05-29 16:05:34 +08:00
parent 6ee83119ee
commit e1b075580e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/crm/src/main/java/com/pudonghot/ambition/crm/controller/AbstractBaseController.java
View File

@ -176,6 +176,8 @@ public abstract class AbstractBaseController {
search.limit(limit); search.limit(limit);
} }
if (StringUtils.isNotBlank(strSearch)) { if (StringUtils.isNotBlank(strSearch)) {
search.attr("hasSearch", true);
val orSearch = new Search(); val orSearch = new Search();
for (val col : searchCols()) { for (val col : searchCols()) {
orSearch.or(new Search().like(col, decodeLike(strSearch))); orSearch.or(new Search().like(col, decodeLike(strSearch)));

6
server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java
View File

@ -221,6 +221,12 @@ public class CustomerController
*/ */
@Override @Override
protected Search defaultFilter(final Search search) { protected Search defaultFilter(final Search search) {
if (search.hasAttr("hasSearch")) {
return search;
}
// default status not NA
val statusCol = CRITERION_COLS.get("status"); val statusCol = CRITERION_COLS.get("status");
return search.and(new Search() return search.and(new Search()
.notNull(statusCol) .notNull(statusCol)