diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 7a06baa56..b8de12324 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -220,8 +220,9 @@ class ProjectController extends AbstractController */ public function add() { - User::auth(); - return Project::createProject(Request::all()); + $user = User::auth(); + // + return Project::createProject(Request::all(), $user->userid); } /** diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 483376c1a..43126f25f 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -120,7 +120,7 @@ class UsersController extends AbstractController 'name' => Base::Lang('个人项目'), 'desc' => Base::Lang('注册时系统自动创建项目,你可以自由删除。'), 'personal' => 1, - ]); + ], $user->userid); } // return Base::retSuccess($type == 'reg' ? "注册成功" : "登录成功", $user); diff --git a/app/Models/Project.php b/app/Models/Project.php index cda9cf947..7245b3a5f 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -476,7 +476,7 @@ class Project extends AbstractModel * - columns * @return array */ - public static function createProject($params) + public static function createProject($params, $userid) { $name = trim(Arr::get($params, 'name', '')); $desc = trim(Arr::get($params, 'desc', '')); @@ -516,10 +516,10 @@ class Project extends AbstractModel $project = Project::createInstance([ 'name' => $name, 'desc' => $desc, - 'userid' => User::userid(), + 'userid' => $userid, ]); if ($isPersonal) { - if (Project::whereUserid(User::userid())->wherePersonal(1)->exists()) { + if (Project::whereUserid($userid)->wherePersonal(1)->exists()) { return Base::retError('个人项目已存在,无须重复创建'); } $project->personal = 1;