合并分支 'zhl' 到 'master'

'添加删除条件'



查看合并请求 !649

@@ -278,7 +278,7 @@ class LoginController extends BaseController
             ];
         }else{
             //有from_order_id, 找到对应的项目并登录主账号
-            $project = (new Project())->read(['from_order_id'=>$arr['from_order_id']]);
+            $project = (new Project())->read(['from_order_id'=>$arr['from_order_id'], 'delete_status' => Project::IS_DEL_FALSE]);
             if(!$project){
                 $this->response('项目不存在，请联系管理员',Code::USER_ERROR);
             }

@@ -35,6 +35,9 @@ class Project extends Base
     const IS_UPGRADE_FALSE = 0;
     const IS_UPGRADE_TRUE = 1;
 
+    const IS_DEL_FALSE = 0;
+    const IS_DEL_TRUE = 1;
+
     /**
      * 星级客户
      * @return string[]