FIX_INCEPTION&EXPORT_FILELIST_ISSUE
This commit is contained in:
parent
b10ddfb8cd
commit
0126473c18
@ -344,9 +344,11 @@ class EmployeeController extends AdminController
|
|||||||
$query->where('cr.user_id', $user_id);
|
$query->where('cr.user_id', $user_id);
|
||||||
}
|
}
|
||||||
// ->where('files.created_by', get_session_userid())
|
// ->where('files.created_by', get_session_userid())
|
||||||
$data['fileList'] = $query->groupBy("c.id")->orderBy('files.created_at', 'desc')
|
$data['fileList'] = $query->groupBy("files.id")->orderBy('files.created_at', 'desc')
|
||||||
->limit(1500)
|
// $data['fileList'] = $query
|
||||||
|
->limit(2000)
|
||||||
->find();
|
->find();
|
||||||
|
// dd($this->fileModel->getLastQuery());
|
||||||
// dd($data['fileList']);
|
// dd($data['fileList']);
|
||||||
|
|
||||||
$query2 = $this->batchFileModel->select("
|
$query2 = $this->batchFileModel->select("
|
||||||
@ -395,7 +397,7 @@ class EmployeeController extends AdminController
|
|||||||
$query2->where('cr.user_id', $user_id);
|
$query2->where('cr.user_id', $user_id);
|
||||||
}
|
}
|
||||||
// ->where('files.created_by', get_session_userid())
|
// ->where('files.created_by', get_session_userid())
|
||||||
$data['batch_list'] = $query2->groupBy("clients.id")->orderBy('batch_files.id', 'desc')
|
$data['batch_list'] = $query2->groupBy("batch_files.id")->orderBy('batch_files.id', 'desc')
|
||||||
->limit(1500)
|
->limit(1500)
|
||||||
->find();
|
->find();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user