github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-07-24 08:31:45 +08:00
Code Issues Releases Wiki Activity

Merge pull request #966 from lecjy/feature/I8F61B

Browse Source 
fix #I8F61B https://gitee.com/cskefu/cskefu/issues/I8F61B
This commit is contained in:
Hai Liang W 2023-11-14 09:00:00 +08:00 committed by GitHub
commit 8cef472427
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java
View File

@ -116,8 +116,9 @@ public class ContactsController extends Handler {
map.addAttribute("currentOrgan", currentOrgan); map.addAttribute("currentOrgan", currentOrgan);
Page<Contacts> contacts = contactsRes.findByOrganInAndSharesAllAndDatastatusFalse( Page<Contacts> contacts = contactsRes.findByOrganInAndCkindAndSharesAllAndDatastatusFalse(
super.getMyCurrentAffiliatesFlat(logined), super.getMyCurrentAffiliatesFlat(logined),
ckind,
PageRequest.of(super.getP(request), super.getPs(request))); PageRequest.of(super.getP(request), super.getPs(request)));
map.addAttribute("contactsList", contacts); map.addAttribute("contactsList", contacts);

4
contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java
View File

@ -50,8 +50,8 @@ public interface ContactsRepository extends JpaRepository<Contacts, String> {
* @param pageRequest * @param pageRequest
* @return * @return
*/ */
@Query("select c from Contacts c where c.organ IN :organs AND c.shares = 'all' AND c.datastatus = false") @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> findByOrganInAndSharesAllAndDatastatusFalse(@Param("organs") Collection<String> organs, Pageable pageRequest); Page<Contacts> findByOrganInAndCkindAndSharesAllAndDatastatusFalse(@Param("organs") Collection<String> organs, @Param("ckind") String ckind, Pageable pageRequest);
Page<Contacts> findByDatastatus(boolean b, Pageable pageRequest); Page<Contacts> findByDatastatus(boolean b, Pageable pageRequest);
} }