diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index a6fac6a..27a3a94 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -71,10 +71,16 @@ class ProjectController extends Controller
             return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
         $result = Project::query()
-            ->select(array_diff(DB::getSchemaBuilder()->getColumnListing('m_proyek'), ['created_by', 'created_at', 'updated_at', 'updated_by', 'scurve']))
-            ->whereId($id)
-            ->first();
+            ->from('m_proyek AS mp')
+            ->where('mp.id', $id)
+            ->selectRaw('kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,lokasi_kantor,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')
+            ->addSelect(DB::raw('m_divisi.name AS nama_divisi'));
+        }
+
+        $result = $result->first();
 
 		if(!$result)
 			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 6d3d5f4..cf2d0ad 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -1,54 +1,54 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Project extends Model
-{
-	protected $table = 'm_proyek';
-
-	const CREATED_AT = 'created_at';
-	const UPDATED_AT = 'updated_at';
-
-	protected $fillable = [
-		'kode_sortname',
-		'jumlah_stakeholder',
-		'nama',
-		'mulai_proyek',
-		'akhir_proyek',
-		'area_kerja',
-		'lokasi_kantor',
-		'rencana_biaya',
-		'biaya_actual',
-		'company',
-		'pm_id',
-		'type_proyek_id',
-		'divisi_id',
-		'persentase_progress',
-		'keterangan',
-		'durasi_proyek',
-		'progress_by_worklog',
-		'status',
-		'currency_simbol',
-		'currency_code',
-		'currency_name',
-		'project_objectives',
-		'considered_success_when',
-		'potential_risk',
-		'testing_environment',
-		'currency_code',
-		'currency_symbol',
-		'currency_name',
-		'budget_health',
-		'phase_id',
-    	'calculation_status',
-    	'scurve',
-		'created_at',
-		'created_by',
-		'updated_at',
-		'updated_by'
-	];
-
-
-}
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Project extends Model
+{
+	protected $table = 'm_proyek';
+
+	const CREATED_AT = 'created_at';
+	const UPDATED_AT = 'updated_at';
+
+	protected $fillable = [
+		'kode_sortname',
+		'jumlah_stakeholder',
+		'nama',
+		'mulai_proyek',
+		'akhir_proyek',
+		'area_kerja',
+		'lokasi_kantor',
+		'rencana_biaya',
+		'biaya_actual',
+		'company',
+		'pm_id',
+		'type_proyek_id',
+		'divisi_id',
+		'persentase_progress',
+		'keterangan',
+		'durasi_proyek',
+		'progress_by_worklog',
+		'status',
+        'currency_symbol',
+		'currency_code',
+		'currency_name',
+		'project_objectives',
+		'considered_success_when',
+		'potential_risk',
+		'testing_environment',
+		'budget_health',
+		'phase_id',
+        'late_consequence',
+        'assumtion',
+    	'calculation_status',
+        'structur_organization',
+    	'scurve',
+		'created_at',
+		'created_by',
+		'updated_at',
+		'updated_by'
+	];
+
+
+}