diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/AbstractBaseController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/AbstractBaseController.java index 4e615dc..660649c 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/AbstractBaseController.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/AbstractBaseController.java @@ -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))); diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java index 77b025e..5f908ee 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java @@ -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)