From d51f1abf67cefdfa9fe8e4c44626050dd877d753 Mon Sep 17 00:00:00 2001
From: Donghuang <donghuang.cxn@cainiao.com>
Date: Fri, 26 May 2023 16:10:14 +0800
Subject: [PATCH] customer status filter bug fixes

---
 .../ambition/crm/controller/CustomerController.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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));
     }
 
     /**