fix #I8F61B https://gitee.com/cskefu/cskefu/issues/I8F61B

Signed-off-by: lecjy <565572696@qq.com>
cskefu · Nov 13, 2023 · 95e7197 · 95e7197
1 parent fe6ca09
commit 95e7197
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -113,8 +113,9 @@ public ModelAndView index(
 
         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/...act-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java b/...act-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);
 }