diff --git a/src/com/linways/api/v1/examValuation/controller/ExamValuationController.php b/src/com/linways/api/v1/examValuation/controller/ExamValuationController.php index 37b08f32a0..b05a06673a 100644 --- a/src/com/linways/api/v1/examValuation/controller/ExamValuationController.php +++ b/src/com/linways/api/v1/examValuation/controller/ExamValuationController.php @@ -3821,7 +3821,7 @@ class ExamValuationController extends ExamControllerBaseController {  if($searchRequest->haveDepartmentRestriction){ $accessibleProperties = AcademicCommonService::getInstance()->staffAccessibleProgramDepartmentAndBatches(); - $searchRequest->groupsId = $accessibleProperties->batchIds; + $searchRequest->departmentIds = $accessibleProperties->departmentIds; } if($searchRequest->examType == "REVALUATION"){ // $programResult = ExamValuationService::getInstance()->getSubjectsForStaffSideMarkEntryRevaluation($searchRequest); @@ -3854,7 +3854,6 @@ class ExamValuationController extends ExamControllerBaseController { if($request->haveDepartmentRestriction){ $accessibleProperties = AcademicCommonService::getInstance()->staffAccessibleProgramDepartmentAndBatches(); - $request->groupsId = $accessibleProperties->batchIds; //get dept name if(!empty($accessibleProperties->departmentIds)){ $getAllDepartmentRequest = new GetAllDepartmentsRequest; diff --git a/src/com/linways/core/service/ExamRegistrationSubjectService.php b/src/com/linways/core/service/ExamRegistrationSubjectService.php index 8320914e0f..11a1173d24 100644 --- a/src/com/linways/core/service/ExamRegistrationSubjectService.php +++ b/src/com/linways/core/service/ExamRegistrationSubjectService.php @@ -3799,9 +3799,9 @@ class ExamRegistrationSubjectService extends BaseService $whereQuery = ""; try  {  - if(!empty($request->groupsId)) { - $groupsIds = is_array($request->groupsId) ? "'" . implode("','",$request->groupsId) . "'" : "'".$request->groupsId."'"; - $whereQuery .= " AND eerb.groups_id IN ( $groupsIds )"; + if(!empty($request->departmentIds)) { + $departmentIds = is_array($request->departmentIds) ? "'" . implode("','",$request->departmentIds) . "'" : "'".$request->departmentIds."'"; + $whereQuery .= " AND s.department_id IN ( $departmentIds )"; } $query = "SELECT DISTINCT(aps.id) as id,