diff --git a/app/Http/Controllers/HumanResourceController.php b/app/Http/Controllers/HumanResourceController.php
index be26a1c..6c78f6c 100644
--- a/app/Http/Controllers/HumanResourceController.php
+++ b/app/Http/Controllers/HumanResourceController.php
@@ -16,7 +16,8 @@ class HumanResourceController extends Controller
             'role_id'       => 'required',
             'name'          => 'required',
             'ktp_number'    => 'required|numeric|unique:m_users,ktp_number',
-            'employee_type' => 'required'
+            'employee_type' => 'required',
+            'company_id'    => 'required'
         ]);
 
         $data = $request->all();
@@ -118,7 +119,7 @@ class HumanResourceController extends Controller
 
     public function list()
     {
-        $data = HumanResource::select('id', 'name', 'role_id')->get();
+        $data = HumanResource::select('id', 'name', 'role_id','company_id')->get();
         $countData = $data->count();
 
         if ($data) {
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index f4af843..c69e57d 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -53,7 +53,8 @@ class ProjectController extends Controller
 			'mulai_proyek' => 'required',
 			'akhir_proyek' => 'required',
 			'rencana_biaya' => 'required',
-			'type_proyek_id' => 'required'
+			'type_proyek_id' => 'required',
+            'company_id' => 'required'
 		]);
 
 		$data = $request->all();
@@ -83,7 +84,7 @@ class ProjectController extends Controller
 		$result = Project::query()
 			->from('m_proyek AS mp')
 			->where('mp.id', $id)
-			->selectRaw('value_proyek,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status');
+			->selectRaw('value_proyek,mp.company_id,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status');
 
 		if (!is_null($result->first()['divisi_id'])) {
 			$result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id')
diff --git a/app/Http/Controllers/ProjectRoleController.php b/app/Http/Controllers/ProjectRoleController.php
index e12586b..19be106 100644
--- a/app/Http/Controllers/ProjectRoleController.php
+++ b/app/Http/Controllers/ProjectRoleController.php
@@ -1,120 +1,121 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\ProjectRole;
-
-class ProjectRoleController extends Controller
-{
-    public function add(Request $request)
-    {
-        $this->validate($request, [
-            'name' => 'required',
-            'description' => 'required'
-        ]);
-
-        $data = $request->all();
-
-        $data['created_by'] = $this->currentName;
-
-        $result = ProjectRole::create($data);
-
-        if($result){
-            return response()->json(['status'=>'success','message'=>'add data project role successfully!','code'=>200], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'add data project role failed!','code'=>400], 400);
-        }
-    }
-
-    public function edit($id){
-        if(!$id || (int) $id < 0 || $id==""){
-            return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-            die();
-        }
-
-        $result = ProjectRole::find($id);
-
-        if($result){
-            return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'failed get data project role, please try again later!','code'=>400], 400);
-        }
-    }
-
-    public function update(Request $request, $id)
-    {
-        if(!$id || (int) $id < 0 || $id==""){
-            return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-        }
-
-        $data = ProjectRole::find($id);
-
-        if($data){
-            $result = $data->update($request->all());
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
-            die();
-        }
-        
-        
-        if($result){
-            return response()->json(['status'=>'success','message'=>'data project role successfully updated!','code'=>200], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data project role failed updated!','code'=>400], 400);
-        }
-    }
-
-    public function delete($id)
-    {
-        $data = ProjectRole::find($id);
-
-        if($data){
-            $delete = $data->delete();
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
-            die();
-        }
-        
-
-        if($delete){
-            return response()->json(['status'=>'success','message'=>'data project role successfully deleted!','code'=>200], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data project role failed deleted!','code'=>400], 400);
-        }
-    }
-
-    public function search(Request $request)
-    {
-        $payload = $request->all();
-        $dataBuilder = $this->setUpPayload($payload, 'm_role_proyek');
-        $builder = $dataBuilder['builder'];
-        $countBuilder = $dataBuilder['count'];
-        $dataGet = $builder->get();
-        $totalRecord = $countBuilder->count();
-        return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-    }
-
-    public function list()
-    {
-        $data = ProjectRole::all();
-        $countData = $data->count();
-
-        if($data){
-            return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'failed get list project role, please try again later!','code'=>400], 400);
-        }
-    }
-
-    public function select(Request $request){
-        $search = $request->query('search');
-        if($search && !empty($search)){
-            $data = ProjectRole::where("name", 'like', '%'.$search.'%')->get();
-        }else{
-            $data = ProjectRole::all();
-        }
-
-        return response()->json($data);
-    }
-}
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\ProjectRole;
+
+class ProjectRoleController extends Controller
+{
+    public function add(Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required',
+            'description' => 'required',
+            'company_id' => 'required'
+        ]);
+
+        $data = $request->all();
+
+        $data['created_by'] = $this->currentName;
+
+        $result = ProjectRole::create($data);
+
+        if($result){
+            return response()->json(['status'=>'success','message'=>'add data project role successfully!','code'=>200], 200);
+        }else{
+            return response()->json(['status'=>'failed','message'=>'add data project role failed!','code'=>400], 400);
+        }
+    }
+
+    public function edit($id){
+        if(!$id || (int) $id < 0 || $id==""){
+            return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+            die();
+        }
+
+        $result = ProjectRole::find($id);
+
+        if($result){
+            return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
+        }else{
+            return response()->json(['status'=>'failed','message'=>'failed get data project role, please try again later!','code'=>400], 400);
+        }
+    }
+
+    public function update(Request $request, $id)
+    {
+        if(!$id || (int) $id < 0 || $id==""){
+            return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+        }
+
+        $data = ProjectRole::find($id);
+
+        if($data){
+            $result = $data->update($request->all());
+        }else{
+            return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
+            die();
+        }
+
+
+        if($result){
+            return response()->json(['status'=>'success','message'=>'data project role successfully updated!','code'=>200], 200);
+        }else{
+            return response()->json(['status'=>'failed','message'=>'data project role failed updated!','code'=>400], 400);
+        }
+    }
+
+    public function delete($id)
+    {
+        $data = ProjectRole::find($id);
+
+        if($data){
+            $delete = $data->delete();
+        }else{
+            return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
+            die();
+        }
+
+
+        if($delete){
+            return response()->json(['status'=>'success','message'=>'data project role successfully deleted!','code'=>200], 200);
+        }else{
+            return response()->json(['status'=>'failed','message'=>'data project role failed deleted!','code'=>400], 400);
+        }
+    }
+
+    public function search(Request $request)
+    {
+        $payload = $request->all();
+        $dataBuilder = $this->setUpPayload($payload, 'm_role_proyek');
+        $builder = $dataBuilder['builder'];
+        $countBuilder = $dataBuilder['count'];
+        $dataGet = $builder->get();
+        $totalRecord = $countBuilder->count();
+        return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
+    }
+
+    public function list()
+    {
+        $data = ProjectRole::all();
+        $countData = $data->count();
+
+        if($data){
+            return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
+        }else{
+            return response()->json(['status'=>'failed','message'=>'failed get list project role, please try again later!','code'=>400], 400);
+        }
+    }
+
+    public function select(Request $request){
+        $search = $request->query('search');
+        if($search && !empty($search)){
+            $data = ProjectRole::where("name", 'like', '%'.$search.'%')->get();
+        }else{
+            $data = ProjectRole::all();
+        }
+
+        return response()->json($data);
+    }
+}
diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index 7e6dbde..9b1c8b5 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -12,7 +12,8 @@ class RoleController extends Controller
 	{
 		$this->validate($request, [
 			'name'        => 'string|required|unique:m_roles,name,NULL,id,company_id,' . $request->input('company_id'),
-			'description' => 'required'
+			'description' => 'required',
+            'company_id' => 'required'
 		]);
 
 		$data = $request->all();