customer status filter bug fixes

2023-05-26 16:10:14 +08:00 · 2023-05-26 16:10:14 +08:00 · d51f1abf67
commit d51f1abf67
parent 53d285cb33
1 changed files with 5 additions and 1 deletions
--- 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));
    }

    /**