正在显示
1 个修改的文件
包含
3 行增加
和
3 行删除
| @@ -199,7 +199,8 @@ class ProjectController extends BaseController | @@ -199,7 +199,8 @@ class ProjectController extends BaseController | ||
| 199 | $info = $managerHr->read(['manage_id'=>$this->manage['id']]); | 199 | $info = $managerHr->read(['manage_id'=>$this->manage['id']]); |
| 200 | //获取当前用户自己的项目 | 200 | //获取当前用户自己的项目 |
| 201 | $query->where(function ($subQuery) use ($info) { | 201 | $query->where(function ($subQuery) use ($info) { |
| 202 | - $subQuery->where('gl_project_deploy_build.leader_mid', $this->manage['id']) | 202 | + $subQuery->where('gl_project.id', 'in' ,[1,3])//项目1+项目3默认显示 |
| 203 | + ->orWhere('gl_project_deploy_build.leader_mid', $this->manage['id']) | ||
| 203 | ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id']) | 204 | ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id']) |
| 204 | ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id']) | 205 | ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id']) |
| 205 | ->orWhere('gl_project_deploy_build.tech_mid', $this->manage['id']) | 206 | ->orWhere('gl_project_deploy_build.tech_mid', $this->manage['id']) |
| @@ -211,8 +212,7 @@ class ProjectController extends BaseController | @@ -211,8 +212,7 @@ class ProjectController extends BaseController | ||
| 211 | ->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id']) | 212 | ->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id']) |
| 212 | ->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id']) | 213 | ->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id']) |
| 213 | ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group']) | 214 | ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group']) |
| 214 | - ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']) | ||
| 215 | - ->orWhere('gl_project.id', 'in' ,[1,3]);//项目1+项目3默认显示 | 215 | + ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']); |
| 216 | }); | 216 | }); |
| 217 | } | 217 | } |
| 218 | return $query; | 218 | return $query; |
-
请 注册 或 登录 后发表评论