From 95e7197f532e0d400fa2f2af9ec69f13de2d3e50 Mon Sep 17 00:00:00 2001
From: lecjy <565572696@qq.com>
Date: Mon, 13 Nov 2023 20:07:13 +0800
Subject: [PATCH] fix #I8F61B https://gitee.com/cskefu/cskefu/issues/I8F61B

Signed-off-by: lecjy <565572696@qq.com>
---
 .../com/cskefu/cc/controller/apps/ContactsController.java     | 3 ++-
 .../cskefu/cc/persistence/repository/ContactsRepository.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java
index ad9f4401..58a59ea1 100644
--- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java
+++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java
@@ -113,8 +113,9 @@ public class ContactsController extends Handler {
 
         map.addAttribute("currentOrgan", currentOrgan);
 
-        Page<Contacts> contacts = contactsRes.findByOrganInAndSharesAllAndDatastatusFalse(
+        Page<Contacts> contacts = contactsRes.findByOrganInAndCkindAndSharesAllAndDatastatusFalse(
                 super.getMyCurrentAffiliatesFlat(logined),
+                ckind,
                 PageRequest.of(super.getP(request), super.getPs(request)));
 
         map.addAttribute("contactsList", contacts);
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 dec00c22..0f45681f 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,8 +50,8 @@ public interface ContactsRepository extends JpaRepository<Contacts, String> {
      * @param pageRequest
      * @return
      */
-    @Query("select c from Contacts c where c.organ IN :organs AND c.shares = 'all' AND c.datastatus = false")
-    Page<Contacts> findByOrganInAndSharesAllAndDatastatusFalse(@Param("organs") Collection<String> organs, Pageable pageRequest);
+    @Query("select c from Contacts c where c.organ IN :organs and 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);
 }