正在显示
1 个修改的文件
包含
15 行增加
和
14 行删除
| @@ -173,20 +173,21 @@ class ProjectController extends BaseController | @@ -173,20 +173,21 @@ class ProjectController extends BaseController | ||
| 173 | $managerHr = new ManageHr(); | 173 | $managerHr = new ManageHr(); |
| 174 | $info = $managerHr->read(['manage_id'=>$this->manage['id']]); | 174 | $info = $managerHr->read(['manage_id'=>$this->manage['id']]); |
| 175 | //获取当前用户自己的项目 | 175 | //获取当前用户自己的项目 |
| 176 | - $where = $query->where('gl_project_deploy_build.leader_mid',$this->manage['id']) | ||
| 177 | - ->orWhere('gl_project_deploy_build.manager_mid',$this->manage['id']) | ||
| 178 | - ->orWhere('gl_project_deploy_build.designer_mid',$this->manage['id']) | ||
| 179 | - ->orWhere('gl_project_deploy_build.tech_mid',$this->manage['id']) | ||
| 180 | - ->orWhere('gl_project_deploy_optimize.manager_mid',$this->manage['id']) | ||
| 181 | - ->orWhere('gl_project_deploy_optimize.optimist_mid',$this->manage['id']) | ||
| 182 | - ->orWhere('gl_project_deploy_optimize.assist_mid',$this->manage['id']) | ||
| 183 | - ->orWhere('gl_project_deploy_optimize.tech_mid',$this->manage['id']) | ||
| 184 | - ->orWhere('gl_project_deploy_optimize.tech_leader',$this->manage['id']) | ||
| 185 | - ->orWhere('gl_project_deploy_optimize.quality_mid',$this->manage['id']) | ||
| 186 | - ->orWhere('gl_project_deploy_optimize.design_mid',$this->manage['id']) | ||
| 187 | - ->orWhere('gl_project_deploy_build.dept_id',$info['belong_group']) | ||
| 188 | - ->orWhere('gl_project_deploy_optimize.dept_id',$info['belong_group']); | ||
| 189 | - $query = $query->where($where); | 176 | + $query->where(function ($query) use ($info) { |
| 177 | + $query->where('gl_project_deploy_build.leader_mid', $this->manage['id']) | ||
| 178 | + ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id']) | ||
| 179 | + ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id']) | ||
| 180 | + ->orWhere('gl_project_deploy_build.tech_mid', $this->manage['id']) | ||
| 181 | + ->orWhere('gl_project_deploy_optimize.manager_mid', $this->manage['id']) | ||
| 182 | + ->orWhere('gl_project_deploy_optimize.optimist_mid', $this->manage['id']) | ||
| 183 | + ->orWhere('gl_project_deploy_optimize.assist_mid', $this->manage['id']) | ||
| 184 | + ->orWhere('gl_project_deploy_optimize.tech_mid', $this->manage['id']) | ||
| 185 | + ->orWhere('gl_project_deploy_optimize.tech_leader', $this->manage['id']) | ||
| 186 | + ->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id']) | ||
| 187 | + ->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id']) | ||
| 188 | + ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group']) | ||
| 189 | + ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']); | ||
| 190 | + }); | ||
| 190 | } | 191 | } |
| 191 | return $query; | 192 | return $query; |
| 192 | } | 193 | } |
-
请 注册 或 登录 后发表评论