|
...
|
...
|
@@ -171,7 +171,7 @@ class ProjectController extends BaseController |
|
|
|
if($this->manage['role'] != 1){//1代表查看所有
|
|
|
|
//获取当前用户自己的项目
|
|
|
|
$query = $query
|
|
|
|
->orwhere('gl_project_deploy_build.leader_mid',$this->manage['id'])
|
|
|
|
->where('gl_project_deploy_build.leader_mid',$this->manage['id'])
|
|
|
|
->orwhere('gl_project_deploy_build.manager_mid',$this->manage['id'])
|
|
|
|
->orwhere('gl_project_deploy_build.designer_mid',$this->manage['id'])
|
|
|
|
->orwhere('gl_project_deploy_build.tech_mid',$this->manage['id'])
|
|
...
|
...
|
@@ -183,10 +183,10 @@ class ProjectController extends BaseController |
|
|
|
->orwhere('gl_project_deploy_optimize.quality_mid',$this->manage['id'])
|
|
|
|
->orwhere('gl_project_deploy_optimize.design_mid',$this->manage['id']);
|
|
|
|
//获取用户所在组
|
|
|
|
$managerHr = new ManageHr();
|
|
|
|
$info = $managerHr->read(['manage_id'=>$this->manage['id']]);
|
|
|
|
$query = $query->orwhere('gl_project_deploy_build.dept_id',$info['belong_group'])
|
|
|
|
->orwhere('gl_project_deploy_optimize.dept_id',$info['belong_group']);
|
|
|
|
// $managerHr = new ManageHr();
|
|
|
|
// $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
|
|
|
|
// $query = $query->where('gl_project_deploy_build.dept_id',$info['belong_group'])
|
|
|
|
// ->orwhere('gl_project_deploy_optimize.dept_id',$info['belong_group']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|
