合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2989

@@ -320,7 +320,7 @@ class ProjectController extends BaseController
             }
             }
         }
         }
         if(isset($this->map['seo_plan'])){
         if(isset($this->map['seo_plan'])){
-            $query = $query->where('gl_project_deploy_build.seo_plan','!=',0);
+            $query = $query->whereNotIn('gl_project_deploy_build.seo_plan',[0,9])->where('gl_project.plan',0);
         }
         }
         if(isset($this->map['site_status'])){
         if(isset($this->map['site_status'])){
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
             $query = $query->where('gl_project.site_status',$this->map['site_status']);

@@ -55,7 +55,7 @@ class LoginAuthMiddleware
         //操作权限设置
         //操作权限设置
         $projectRoleModel = new ProjectRoleModel();
         $projectRoleModel = new ProjectRoleModel();
         $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);
         $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);
-        if($role_info['status'] != 0){
+        if($role_info === false || $role_info['status'] != 0){
             return response(['code'=>Code::USER_LOGIN_ERROE,'message'=>'当前用户角色被禁用']);
             return response(['code'=>Code::USER_LOGIN_ERROE,'message'=>'当前用户角色被禁用']);
         }
         }
         return $role_info;
         return $role_info;