gx

@@ -169,8 +169,11 @@ class ProjectController extends BaseController
      */
      */
     public function getManagerRole(&$query){
     public function getManagerRole(&$query){
         if($this->manage['role'] != 1){//1代表查看所有
         if($this->manage['role'] != 1){//1代表查看所有
+            //获取用户所在组
+            $managerHr = new ManageHr();
+            $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             //获取当前用户自己的项目
             //获取当前用户自己的项目
-            $query = $query->where('gl_project_deploy_build.leader_mid',$this->manage['id'])
+            $where = $query->orwhere('gl_project_deploy_build.leader_mid',$this->manage['id'])
                 ->orwhere('gl_project_deploy_build.manager_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.designer_mid',$this->manage['id'])
                 ->orwhere('gl_project_deploy_build.tech_mid',$this->manage['id'])
                 ->orwhere('gl_project_deploy_build.tech_mid',$this->manage['id'])
@@ -180,12 +183,10 @@ class ProjectController extends BaseController
                 ->orwhere('gl_project_deploy_optimize.tech_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.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']);
-            //获取用户所在组
-            $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.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']);
                 ->orwhere('gl_project_deploy_optimize.dept_id',$info['belong_group']);
+            $query = $query->where($where);
         }
         }
         return $query;
         return $query;
     }
     }