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 3bb55b2a..7bd4e94c 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 @@ -116,8 +116,9 @@ public class ContactsController extends Handler { map.addAttribute("currentOrgan", currentOrgan); - Page contacts = contactsRes.findByOrganInAndSharesAllAndDatastatusFalse( + Page 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 1784968f..996d1f2b 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 { * @param pageRequest * @return */ - @Query("select c from Contacts c where c.organ IN :organs AND c.shares = 'all' AND c.datastatus = false") - Page findByOrganInAndSharesAllAndDatastatusFalse(@Param("organs") Collection 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 findByOrganInAndCkindAndSharesAllAndDatastatusFalse(@Param("organs") Collection organs, @Param("ckind") String ckind, Pageable pageRequest); Page findByDatastatus(boolean b, Pageable pageRequest); }