|
...
|
...
|
@@ -56,7 +56,6 @@ class ProjectController extends BaseController |
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
|
|
|
|
$query = $this->searchParam($query);
|
|
|
|
$lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page);
|
|
|
|
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($lists, true) . PHP_EOL, FILE_APPEND);
|
|
|
|
if(!empty($lists) && !empty($lists['list'])){
|
|
|
|
$lists = $lists->toArray();
|
|
|
|
foreach ($lists['list'] as $k => $v){
|
|
...
|
...
|
@@ -215,7 +214,7 @@ class ProjectController extends BaseController |
|
|
|
->orWhere('gl_project_deploy_optimize.assist_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_leader', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id'])
|
|
|
|
// ->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
|
...
|
...
|
|
