gx关闭项目理由

@@ -63,7 +63,10 @@ class UserLoginLogic
             $projectArr[] = $v['project_id'];
             $projectArr[] = $v['project_id'];
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
-        $project_list = $projectModel->list(['id'=>['in',$projectArr],'delete_status'=>0],'id',['id','title']);
+        $project_list = $projectModel->list(['id'=>['in',$projectArr],'type'=>['!=',8],'delete_status'=>0],'id',['id','title']);
+        if(empty($project_list)){
+            $this->fail('当前项目已关闭，请联系管理员');
+        }
         foreach ($project_list as $k => $v){
         foreach ($project_list as $k => $v){
             $v['domain'] = (new DomainInfo())->getProjectIdDomain($v['id']);
             $v['domain'] = (new DomainInfo())->getProjectIdDomain($v['id']);
             $project_list[$k] = $v;
             $project_list[$k] = $v;
@@ -181,12 +184,15 @@ class UserLoginLogic
      * @time   :2023/8/29 15:26
      * @time   :2023/8/29 15:26
      */
      */
     public function assembleParam($mobile,$project_id){
     public function assembleParam($mobile,$project_id){
-        $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','wechat','project_id']);
+        $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','type','role_id','token','name','wechat','project_id']);
         //获取项目详情
         //获取项目详情
         $project = $this->getProjectInfo($project_id);
         $project = $this->getProjectInfo($project_id);
         if($project['site_status'] != 0){//关闭站点
         if($project['site_status'] != 0){//关闭站点
             $this->fail('当前网站已过期，请联系管理员及时续费。');
             $this->fail('当前网站已过期，请联系管理员及时续费。');
         }
         }
+        if($project['type'] == 8){//关闭项目
+            $this->fail('当前网站已关闭，请联系管理员。');
+        }
         $info = $this->handleInfo($info,$project);
         $info = $this->handleInfo($info,$project);
         $info['login_source'] = User::LOGIN_PASSWORD_SOURCE;//账号密码登录返回
         $info['login_source'] = User::LOGIN_PASSWORD_SOURCE;//账号密码登录返回
         //保存项目缓存
         //保存项目缓存