Merge pull request #953 from egovernments/master

Megre master to develop
egovernments · Sep 13, 2024 · 0c08591 · 0c08591
2 parents 42f81d7 + 6526545
commit 0c08591
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/business-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java b/business-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java
@@ -661,7 +661,11 @@ public EmployeeResponse searchListOfEmployee(EmployeeSearchCriteria criteria, Re
 				userSearchCriteria.put(HRMSConstants.HRMS_USER_SEARCH_CRITERA_ROLECODES,criteria.getRoles());
 			UserResponse userResponse = userService.getUserByTenantids(requestInfo, userSearchCriteria);
 			userChecked =true;
-			if(!CollectionUtils.isEmpty(userResponse.getUser())) {
+			if(CollectionUtils.isEmpty(userResponse.getUser())) {
+				List<Employee> employees = new ArrayList<>();
+				return EmployeeResponse.builder().responseInfo(factory.createResponseInfoFromRequestInfo(requestInfo, true))
+						.employees(employees).build();
+			} else {
 				mapOfUsers.putAll(userResponse.getUser().stream()
 						.collect(Collectors.toMap(User::getUuid, Function.identity())));
 			}