perbaikan activity team so dan logo bag

This commit is contained in:
majid
2025-01-11 08:54:24 +07:00
parent c1b573a275
commit 6289a752e0
3 changed files with 36 additions and 10 deletions

View File

@@ -188,7 +188,7 @@ class ActivityController extends Controller
$userRole = $user->roles[0]->name ?? null;
if (in_array($userRole, ['surveyor', 'surveyor-penilai'])) {
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian',])
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian'])
->whereHas('penilaian.userPenilai', function ($q) use ($user) {
$q->where('user_id', $user->id);
})
@@ -246,7 +246,12 @@ class ActivityController extends Controller
'permohonan.debiture',
'permohonan.tujuanPenilaian',
'permohonan.debiture.documents.jenisJaminan',
'userPenilai'
'userPenilai',
'permohonan.penilai',
'permohonan.approveEo',
'permohonan.approveDd',
'permohonan.approveSo',
])
->whereHas('userPenilai', function ($q) use ($id) {
$q->where('user_id', $id);