Commit 5f63bed4 authored by Vijay Akula's avatar Vijay Akula

Modified code for employee sub status

parent a3c1f534
......@@ -212,7 +212,7 @@ public class EmployeeService implements IEmployeeService {
return employeeRepo.findAll(new Sort(Sort.Direction.ASC, "employeeName"));
} else if (status.equals("Vacation")) {
Query query = new Query();
query.addCriteria(Criteria.where("empSubStatus").ne("Resigned").andOperator(Criteria.where("empSubStatus").ne(null)));
query.addCriteria(Criteria.where("empSubStatus").ne("Resigned").andOperator(Criteria.where("empSubStatus").ne(null),Criteria.where("empSubStatus").ne("")));
return mongoTemplate.find(query, Employee.class);
} else if (status.equals("Resigned")) {
return employeeRepo.findByEmpSubStatusOrderByEmployeeNameAsc("Resigned");
......@@ -221,6 +221,7 @@ public class EmployeeService implements IEmployeeService {
}
}
@Override
public List<Account> getAccounts() throws MyTeamException {
return accountService.getAllAccounts();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment