From 16b417ab31e59c2e2096c42b39e682ebc0d23d6b Mon Sep 17 00:00:00 2001
From: CollectBugs <17853522814@163.com>
Date: Wed, 15 Nov 2023 23:15:28 +0800
Subject: [PATCH] =?UTF-8?q?#I8F61B=20=E8=81=94=E7=B3=BB=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: CollectBugs <17853522814@163.com>
---
 .../cskefu/cc/persistence/repository/ContactsRepository.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java
index 996d1f2b..236413ba 100644
--- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java
+++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java
@@ -50,7 +50,7 @@ public interface ContactsRepository extends JpaRepository<Contacts, String> {
      * @param pageRequest
      * @return
      */
-    @Query("select c from Contacts c where c.organ IN :organs and c.ckind = :ckind AND c.shares = 'all' AND c.datastatus = false")
+    @Query("select c from Contacts c where c.organ IN :organs and (:ckind IS NULL OR c.ckind = :ckind) AND c.shares = 'all' AND c.datastatus = false")
     Page<Contacts> findByOrganInAndCkindAndSharesAllAndDatastatusFalse(@Param("organs") Collection<String> organs, @Param("ckind") String ckind, Pageable pageRequest);
 
     Page<Contacts> findByDatastatus(boolean b, Pageable pageRequest);