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 36c52c6..dc11429 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,7 +221,11 @@ public class CustomerController */ @Override protected Search defaultFilter(final Search search) { - return search.ne(CRITERION_COLS.get("status"), CustomerProperty.STATUS_NA_ID); + val statusCol = CRITERION_COLS.get("status"); + return search.and(new Search() + .notNull(statusCol) + .ne(statusCol, CustomerProperty.STATUS_NA_ID) + .or(statusCol, null)); } /**