251216_01_ENH : 프로젝트에 FW User 배정 구현 및 테스트 완료
This commit is contained in:
@@ -155,10 +155,16 @@ public class UserService {
|
||||
);
|
||||
}
|
||||
|
||||
public List<UserInfoDto> getUserListWithCmpn(String searchCmpn){
|
||||
public List<UserInfoDto> getUserList(){
|
||||
return userRepository.findByDelFalse().stream()
|
||||
.map(UserInfoDto::from)
|
||||
.toList();
|
||||
}
|
||||
|
||||
public List<UserInfoDto> getFieldworkUserListWithCmpn(String searchCmpn){
|
||||
List<TUserEntity> userList;
|
||||
if(searchCmpn == null || searchCmpn.isBlank()){
|
||||
userList = userRepository.findByDelFalse();
|
||||
userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(AppConstant.FIELDWORK_USER_ROLE);
|
||||
}
|
||||
else{
|
||||
userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, AppConstant.FIELDWORK_USER_ROLE);
|
||||
|
||||
Reference in New Issue
Block a user