Browse Source

Merge pull request 'dev-wahyu' (#64) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#64
Reviewed-by: ibnu <ibnu@mail.com>
pull/3/head
ibnu 2 years ago
parent
commit
e1caaf2d66
  1. 2
      app/Http/Controllers/ActivityController.php

2
app/Http/Controllers/ActivityController.php

@ -465,7 +465,7 @@ class ActivityController extends Controller
$activity->save(); $activity->save();
$activity->level = $activity_row['level']; $activity->level = $activity_row['level'];
} }
if (isset($data['activities'][$i]['nik'])) { if (isset($data['activities'][$i]['nik']) && $data['activities'][$i]['nik'] != '') {
$user = User::where("ktp_number", $data['activities'][$i]['nik'])->first(); $user = User::where("ktp_number", $data['activities'][$i]['nik'])->first();
$userProyek = UserToProyek::where("user_id", $user->id) $userProyek = UserToProyek::where("user_id", $user->id)
->where("proyek_id", $projectId) ->where("proyek_id", $projectId)

Loading…
Cancel
Save