diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index 6d3d53c..532e478 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -15,6 +15,8 @@ public interface UserRepository extends JpaRepository, JpaSpe Optional findByUserIdAndDelFalse(String userId); + List findByDelFalse(); + List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); @Query(""" diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index da6786a..726db4e 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -158,7 +158,7 @@ public class UserService { public List getUserListWithCmpn(String searchCmpn){ List userList; if(searchCmpn == null || searchCmpn.isBlank()){ - userList = userRepository.findAll(); + userList = userRepository.findByDelFalse(); } else{ userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, AppConstant.FIELDWORK_USER_ROLE);