|
|
@@ -272,6 +272,6 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public List<UserCombo> getEscalationCombo() { |
|
|
public List<UserCombo> getEscalationCombo() { |
|
|
return userRepository.findUserComboByTitleNotNullAndDepartmentNotNull(); |
|
|
|
|
|
|
|
|
return userRepository.findUserComboByTitleNotNullAndDepartmentNotNullAndNameNotNullAndDeletedFalse(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |