Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -604,6 +604,9 @@ class ProjectLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+        //更新当前项目所有账号状态
+        $userModel = new UserModel();
+        $userModel->edit(['status'=>1],['project_id'=>$this->param['id']]);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -55,7 +55,7 @@ class UserLoginLogic
             $projectArr[] = $v['project_id'];
             $projectArr[] = $v['project_id'];
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
-        $project_list = $projectModel->list(['id'=>['in',$projectArr]],'id',['id','title']);
+        $project_list = $projectModel->list(['id'=>['in',$projectArr],['delete_status'=>0]],'id',['id','title']);
         //登录选择项目的有效时间
         //登录选择项目的有效时间
         Cache::add('login-project-'.$this->param['mobile'],1,300);
         Cache::add('login-project-'.$this->param['mobile'],1,300);
         return $this->success($project_list);
         return $this->success($project_list);