diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php index 5caefdef..605098d5 100755 --- a/Apollo/api/application/models/Employee_model.php +++ b/Apollo/api/application/models/Employee_model.php @@ -675,14 +675,14 @@ class Employee_model extends CI_Model $FinanceModuleAccess = $req['FinanceModuleAccess']; $sql = "UPDATE ".LOGIN." SET ListCode ='$listCode' WHERE StaffID='$empFor'"; if ($this->db->query($sql) == '1') { - $sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'"; - if ($this->db->query($sql1) == '1') { - $result['updateEmpbranchStatus'] = true; - $result['message'] = "Successfully employee branch details Updated"; - } else { - $result['updateEmpbranchStatus'] = false; - $result['message'] = "Something Went Wrong."; - } + // $sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'"; + // if ($this->db->query($sql1) == '1') { + // $result['updateEmpbranchStatus'] = true; + // $result['message'] = "Successfully employee branch details Updated"; + // } else { + // $result['updateEmpbranchStatus'] = false; + // $result['message'] = "Something Went Wrong."; + // } } else { $result['updateEmpbranchStatus'] = false; $result['message'] = "Something Went Wrong."; diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index b3dfd5e8..639a8d87 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -1024,6 +1024,8 @@ class Student_model extends CI_Model { $this->db->group_by('t1.StaffID'); $this->db->where('t1.BranchCode', $loginBranchId); + $this->db->where('t1.IsActive','1'); + $this->db->where('t2.IsActive','1'); // $this->db->where('t1.ListCode', EMPLOYEE); $this->db->order_by('t1.CreatedOn', 'DESC'); $empDetails = $this->db->get();